From 39a5f24477c2b725c613850dbedce293269cee59 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Sat, 18 Jun 2022 15:06:52 +0100
Subject: [PATCH] NonTransfer should be a superset of collator selection
 (#1385)

* This should ideally be set.

* Not convinced guard order is always guarenteed.

* assets / uniques should not be included.

* correction
---
 cumulus/parachains/runtimes/assets/statemine/src/lib.rs | 2 ++
 cumulus/parachains/runtimes/assets/statemint/src/lib.rs | 2 ++
 cumulus/parachains/runtimes/assets/westmint/src/lib.rs  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/cumulus/parachains/runtimes/assets/statemine/src/lib.rs b/cumulus/parachains/runtimes/assets/statemine/src/lib.rs
index 4bdb45601c..a7e3f0ef0d 100644
--- a/cumulus/parachains/runtimes/assets/statemine/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/statemine/src/lib.rs
@@ -377,6 +377,7 @@ impl InstanceFilter<Call> for ProxyType {
 			),
 		}
 	}
+
 	fn is_superset(&self, o: &Self) -> bool {
 		match (self, o) {
 			(x, y) if x == y => true,
@@ -384,6 +385,7 @@ impl InstanceFilter<Call> for ProxyType {
 			(_, ProxyType::Any) => false,
 			(ProxyType::Assets, ProxyType::AssetOwner) => true,
 			(ProxyType::Assets, ProxyType::AssetManager) => true,
+			(ProxyType::NonTransfer, ProxyType::Collator) => true,
 			_ => false,
 		}
 	}
diff --git a/cumulus/parachains/runtimes/assets/statemint/src/lib.rs b/cumulus/parachains/runtimes/assets/statemint/src/lib.rs
index f58a6821cf..54acdc6435 100644
--- a/cumulus/parachains/runtimes/assets/statemint/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/statemint/src/lib.rs
@@ -407,6 +407,7 @@ impl InstanceFilter<Call> for ProxyType {
 			),
 		}
 	}
+
 	fn is_superset(&self, o: &Self) -> bool {
 		match (self, o) {
 			(x, y) if x == y => true,
@@ -414,6 +415,7 @@ impl InstanceFilter<Call> for ProxyType {
 			(_, ProxyType::Any) => false,
 			(ProxyType::Assets, ProxyType::AssetOwner) => true,
 			(ProxyType::Assets, ProxyType::AssetManager) => true,
+			(ProxyType::NonTransfer, ProxyType::Collator) => true,
 			_ => false,
 		}
 	}
diff --git a/cumulus/parachains/runtimes/assets/westmint/src/lib.rs b/cumulus/parachains/runtimes/assets/westmint/src/lib.rs
index 234357c634..9d1c7b9eee 100644
--- a/cumulus/parachains/runtimes/assets/westmint/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/westmint/src/lib.rs
@@ -372,6 +372,7 @@ impl InstanceFilter<Call> for ProxyType {
 			),
 		}
 	}
+
 	fn is_superset(&self, o: &Self) -> bool {
 		match (self, o) {
 			(x, y) if x == y => true,
@@ -379,6 +380,7 @@ impl InstanceFilter<Call> for ProxyType {
 			(_, ProxyType::Any) => false,
 			(ProxyType::Assets, ProxyType::AssetOwner) => true,
 			(ProxyType::Assets, ProxyType::AssetManager) => true,
+			(ProxyType::NonTransfer, ProxyType::Collator) => true,
 			_ => false,
 		}
 	}