refactor: eliminate duplicate code

r0gue-io · Apr 20, 2024 · d3d0091 · d3d0091
1 parent bbb68d1
commit d3d0091
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -134,4 +134,18 @@ pub mod proxy {
 			Self::Any
 		}
 	}
+
+	impl ProxyType {
+		pub fn is_superset(s: &ProxyType, o: &ProxyType) -> bool {
+			match (s, o) {
+				(x, y) if x == y => true,
+				(ProxyType::Any, _) => true,
+				(_, ProxyType::Any) => false,
+				(ProxyType::Assets, ProxyType::AssetOwner) => true,
+				(ProxyType::Assets, ProxyType::AssetManager) => true,
+				(ProxyType::NonTransfer, ProxyType::Collator) => true,
+				_ => false,
+			}
+		}
+	}
 }
diff --git a/runtime/devnet/src/proxy_config.rs b/runtime/devnet/src/proxy_config.rs
@@ -89,15 +89,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 	}
 
 	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::Assets, ProxyType::AssetOwner) => true,
-			(ProxyType::Assets, ProxyType::AssetManager) => true,
-			(ProxyType::NonTransfer, ProxyType::Collator) => true,
-			_ => false,
-		}
+		ProxyType::is_superset(self, o)
 	}
 }
 

diff --git a/runtime/testnet/src/proxy_config.rs b/runtime/testnet/src/proxy_config.rs
@@ -89,15 +89,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 	}
 
 	fn is_superset(&self, o: &Self) -> bool {
-		match (self, o) {
-			(x, y) if x == y => true,
-			(ProxyType::Any, _) => true,
-			(_, ProxyType::Any) => false,
-			(ProxyType::Assets, ProxyType::AssetOwner) => true,
-			(ProxyType::Assets, ProxyType::AssetManager) => true,
-			(ProxyType::NonTransfer, ProxyType::Collator) => true,
-			_ => false,
-		}
+		ProxyType::is_superset(self, o)
 	}
 }