Rename constant to what bridge relayers expect

Cerebellum-Network · Jan 17, 2024 · 5203860 · 5203860
1 parent 166ec4a
commit 5203860
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/pallets/chainbridge/src/lib.rs b/pallets/chainbridge/src/lib.rs
@@ -142,7 +142,7 @@ pub mod pallet {
 		/// This must be unique and must not collide with existing IDs within a set of bridged
 		/// chains.
 		#[pallet::constant]
-		type ChainId: Get<ChainId>;
+		type ChainIdentity: Get<ChainId>;
 
 		#[pallet::constant]
 		type ProposalLifetime: Get<<Self as frame_system::Config>::BlockNumber>;
@@ -482,7 +482,7 @@ pub mod pallet {
 		/// Whitelist a chain ID for transfer
 		pub fn whitelist(id: ChainId) -> DispatchResult {
 			// Cannot whitelist this chain
-			ensure!(id != T::ChainId::get(), Error::<T>::InvalidChainId);
+			ensure!(id != T::ChainIdentity::get(), Error::<T>::InvalidChainId);
 			// Cannot whitelist with an existing entry
 			ensure!(!Self::chain_whitelisted(id), Error::<T>::ChainAlreadyWhitelisted);
 			<ChainNonces<T>>::insert(id, 0);

diff --git a/pallets/chainbridge/src/mock.rs b/pallets/chainbridge/src/mock.rs
@@ -79,7 +79,7 @@ impl crate::pallet::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
 	type AdminOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type Proposal = RuntimeCall;
-	type ChainId = TestChainId;
+	type ChainIdentity = TestChainId;
 	type ProposalLifetime = ProposalLifetime;
 	type BridgeAccountId = BridgeAccountId;
 }

diff --git a/pallets/erc20/src/mock.rs b/pallets/erc20/src/mock.rs
@@ -77,7 +77,7 @@ impl bridge::Config for Test {
     type Event = Event;
     type AdminOrigin = frame_system::EnsureRoot<Self::AccountId>;
     type Proposal = Call;
-    type ChainId = TestChainId;
+    type ChainIdentity = TestChainId;
     type ProposalLifetime = ProposalLifetime;
 }
 

diff --git a/runtime/cere-dev/src/lib.rs b/runtime/cere-dev/src/lib.rs
@@ -1234,7 +1234,7 @@ impl pallet_chainbridge::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type AdminOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type Proposal = RuntimeCall;
-	type ChainId = ChainId;
+	type ChainIdentity = ChainId;
 	type ProposalLifetime = ProposalLifetime;
 	type BridgeAccountId = BridgeAccountId;
 }

diff --git a/runtime/cere/src/lib.rs b/runtime/cere/src/lib.rs
@@ -1239,7 +1239,7 @@ impl pallet_chainbridge::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type AdminOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type Proposal = RuntimeCall;
-	type ChainId = ChainId;
+	type ChainIdentity = ChainId;
 	type ProposalLifetime = ProposalLifetime;
 	type BridgeAccountId = BridgeAccountId;
 }