update evm-tests and merge orml master

AcalaNetwork · zqhxuyuan · May 28, 2022 · May 21, 2022 · May 21, 2022 · May 21, 2022
commit b1953ae91a8a61ef4c633a36febf01bfc19f4f4e
diff --git a/evm-tests b/evm-tests
diff --git a/modules/evm/src/bench/mock.rs b/modules/evm/src/bench/mock.rs
@@ -109,7 +109,7 @@ impl orml_tokens::Config for Runtime {
 	type OnDust = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
+	type ReserveIdentifier = ReserveIdentifier;
 	type DustRemovalWhitelist = Nothing;
 }
 

diff --git a/modules/evm/src/mock.rs b/modules/evm/src/mock.rs
@@ -105,7 +105,7 @@ impl orml_tokens::Config for Runtime {
 	type OnDust = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
+	type ReserveIdentifier = ReserveIdentifier;
 	type DustRemovalWhitelist = Nothing;
 }
 

diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs
@@ -99,7 +99,7 @@ impl orml_tokens::Config for Runtime {
 	type OnDust = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
+	type ReserveIdentifier = ReserveIdentifier;
 	type DustRemovalWhitelist = Nothing;
 }
 

diff --git a/orml b/orml
diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs
@@ -111,7 +111,7 @@ impl orml_tokens::Config for TestRuntime {
 	type OnDust = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
+	type ReserveIdentifier = ReserveIdentifier;
 	type DustRemovalWhitelist = Nothing;
 }
+1 −0		Cargo.dev.toml
+68 −0		asset-registry/Cargo.toml
+10 −0		asset-registry/README.md
+171 −0		asset-registry/src/impls.rs
+323 −0		asset-registry/src/lib.rs
+196 −0		asset-registry/src/mock/mod.rs
+341 −0		asset-registry/src/mock/para.rs
+153 −0		asset-registry/src/mock/relay.rs
+463 −0		asset-registry/src/tests.rs
+29 −0		asset-registry/src/weights.rs
+159 −3		currencies/src/lib.rs
+17 −0		traits/src/asset_registry.rs
+124 −2		traits/src/currency.rs
+3 −1		traits/src/lib.rs