resolve conflicts

bifrost-io · Jun 19, 2024 · d048613 · d048613
1 parent 6ff9067
commit d048613
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/pallets/slpx/src/benchmarking.rs b/pallets/slpx/src/benchmarking.rs
@@ -107,7 +107,6 @@ mod benchmarks {
 			KSM,
 			TargetChain::Astar(receiver),
 			BoundedVec::default(),
-			None,
 		);
 	}
 

diff --git a/pallets/slpx/src/lib.rs b/pallets/slpx/src/lib.rs
@@ -445,7 +445,6 @@ pub mod pallet {
 			currency_id: CurrencyIdOf<T>,
 			target_chain: TargetChain<AccountIdOf<T>>,
 			remark: BoundedVec<u8, ConstU32<32>>,
-			channel_id: Option<u32>,
 		) -> DispatchResultWithPostInfo {
 			let (source_chain_caller, derivative_account, bifrost_chain_caller) =
 				Self::ensure_singer_on_whitelist(origin.clone(), evm_caller, &target_chain)?;

diff --git a/pallets/slpx/src/tests.rs b/pallets/slpx/src/tests.rs
@@ -354,8 +354,7 @@ fn test_add_order() {
 			source_chain_caller,
 			DOT,
 			TargetChain::Astar(source_chain_caller),
-			BoundedVec::default(),
-			None
+			BoundedVec::default()
 		));
 		assert_eq!(OrderQueue::<Test>::get().len(), 1usize);
 		assert_ok!(Slpx::redeem(
@@ -414,8 +413,7 @@ fn test_hook() {
 			source_chain_caller,
 			DOT,
 			TargetChain::Astar(source_chain_caller),
-			BoundedVec::default(),
-			None
+			BoundedVec::default()
 		));
 		assert_eq!(OrderQueue::<Test>::get().len(), 1usize);
 		<frame_system::Pallet<Test>>::set_block_number(2u32.into());