fix: remove unnecessary extract bridge id calls

movementlabsxyz · Oct 15, 2024 · 57d5b4e · 57d5b4e
1 parent 9e8fa76
commit 57d5b4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 30 deletions.
diff --git a/protocol-units/bridge/integration-tests/src/lib.rs b/protocol-units/bridge/integration-tests/src/lib.rs
@@ -53,7 +53,7 @@ impl Default for EthToMovementCallArgs {
 		Self {
 			initiator: b"32Be343B94f860124dC4fEe278FDCBD38C102D88".to_vec(),
 			recipient: MovementAddress(AccountAddress::new(*b"0x00000000000000000000000000face")),
-			bridge_transfer_id: MovementHash(*b"00000000000000000000000transfer9"),
+			bridge_transfer_id: MovementHash(*b"00000000000000000000000transf103"),
 			hash_lock: MovementHash(*keccak256(b"secret")),
 			time_lock: 3600,
 			amount: 100,

diff --git a/protocol-units/bridge/integration-tests/src/utils.rs b/protocol-units/bridge/integration-tests/src/utils.rs
@@ -99,8 +99,9 @@ pub async fn extract_bridge_transfer_id_framework(
         movement_client: &mut MovementClientFramework,
 ) -> Result<[u8; 32], anyhow::Error> {
         let sender_address = movement_client.signer().address();
-        let sequence_number = 0; // Modify as needed
+        let sequence_number = 0;
         let rest_client = movement_client.rest_client();
+	debug!("Sender address: {:?}", sender_address);
 
         let transactions = rest_client
                 .get_account_transactions(sender_address, Some(sequence_number), Some(20))

diff --git a/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs b/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs
@@ -90,21 +90,15 @@ async fn test_movement_client_lock_transfer(
 			.await
 			.expect("Failed to lock bridge transfer");
 
-
-		let bridge_transfer_id: [u8; 32] = test_utils::extract_bridge_transfer_id_framework(
-			&mut mvt_client_harness.movement_client,
-		)
-		.await?;
-		info!("Bridge transfer ID: {:?}", bridge_transfer_id);
-
 		let details = BridgeContract::get_bridge_transfer_details_counterparty(
 			&mut mvt_client_harness.movement_client,
-			BridgeTransferId(bridge_transfer_id),
+			BridgeTransferId(args.bridge_transfer_id.0),
 		)
 		.await
 		.expect("Failed to get bridge transfer details")
 		.expect("Expected to find bridge transfer details, but got None");
 
+		assert_eq!(details.state, 1, "Bridge transfer should be pending.");
 		info!("Bridge transfer details: {:?}", details);
 		Ok(())
 	}
@@ -159,25 +153,17 @@ async fn test_movement_client_complete_transfer(
 			.await
 			.expect("Failed to lock bridge transfer");
 
-
-		let bridge_transfer_id: [u8; 32] = test_utils::extract_bridge_transfer_id_framework(
-			&mut mvt_client_harness.movement_client,
-		)
-		.await?;
-		info!("Bridge transfer ID: {:?}", bridge_transfer_id);
-
 		let details = BridgeContract::get_bridge_transfer_details_counterparty(
 			&mut mvt_client_harness.movement_client,
-			BridgeTransferId(bridge_transfer_id),
+			BridgeTransferId(args.bridge_transfer_id.0),
 		)
 		.await
 		.expect("Failed to get bridge transfer details")
 		.expect("Expected to find bridge transfer details, but got None");
 
+		assert_eq!(details.state, 1, "Bridge transfer should be pending.");
 		info!("Bridge transfer details: {:?}", details);
 
-		assert_eq!(details.state, 1, "Bridge transfer should be pending.");
-		//Wait for the tx to be executed
 		tracing::info!("Wait for the MVT initiated event.");
 
 		let secret = b"secret";
@@ -261,16 +247,9 @@ async fn test_movement_client_abort_transfer(
 			.await
 			.expect("Failed to lock bridge transfer");
 
-
-		let bridge_transfer_id: [u8; 32] = test_utils::extract_bridge_transfer_id_framework(
-			&mut mvt_client_harness.movement_client,
-		)
-		.await?;
-		info!("Bridge transfer ID: {:?}", bridge_transfer_id);
-
 		let details = BridgeContract::get_bridge_transfer_details_counterparty(
 			&mut mvt_client_harness.movement_client,
-			BridgeTransferId(bridge_transfer_id),
+			BridgeTransferId(args.bridge_transfer_id.0),
 		)
 		.await
 		.expect("Failed to get bridge transfer details")

diff --git a/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs b/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs
@@ -88,10 +88,9 @@ async fn test_movement_client_complete_transfer() -> Result<(), anyhow::Error> {
 	let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();
 	MovementClientFramework::bridge_setup_scripts().await?;
 	let config: Config = Config::suzuka();
-	let (mut mvt_client_harness, config) = TestHarnessFramework::new_with_suzuka(config).await;
+	let (mut mvt_client_harness, _config) = TestHarnessFramework::new_with_suzuka(config).await;
 	let args = MovementToEthCallArgs::default();
 	let test_result = async {
-		let sender_address = mvt_client_harness.movement_client.signer().address();
 		test_utils::fund_and_check_balance_framework(&mut mvt_client_harness, 100_000_000_000)
 			.await?;
 		test_utils::initiate_bridge_transfer_helper_framework(