NODE-149, fix: resolve conflicts

bifrost-platform · Nov 14, 2024 · f0f04b4 · f0f04b4
1 parent 5cb889f
commit f0f04b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/btc-registration-pool/src/pallet/impls.rs b/pallets/btc-registration-pool/src/pallet/impls.rs
@@ -96,14 +96,14 @@ impl<T: Config> PoolManager<T::AccountId> for Pallet<T> {
 	}
 
 	fn replace_authority(old: &T::AccountId, new: &T::AccountId) {
-		let round = Self::current_round();
+		let round = CurrentRound::<T>::get();
 		// move pre-submitted pub keys from old to new
 		let pre_submitted_pub_keys = <PreSubmittedPubKeys<T>>::take(round, old);
 		if !pre_submitted_pub_keys.is_empty() {
 			<PreSubmittedPubKeys<T>>::insert(round, new, pre_submitted_pub_keys);
 		}
 		// replace authority in system vault (if it's pending)
-		if let Some(mut vault) = Self::system_vault(round) {
+		if let Some(mut vault) = SystemVault::<T>::get(round) {
 			if vault.address == AddressState::Pending {
 				vault.replace_authority(old, new);
 			}