diff --git a/protocol-units/bridge/integration-tests/src/utils.rs b/protocol-units/bridge/integration-tests/src/utils.rs index 3a5ed2d04..5933b885c 100644 --- a/protocol-units/bridge/integration-tests/src/utils.rs +++ b/protocol-units/bridge/integration-tests/src/utils.rs @@ -1,5 +1,5 @@ #![allow(dead_code)] -use crate::{HarnessMvtClient, HarnessMvtClientFramework, MovementToEthCallArgs}; +use crate::{HarnessMvtClient, HarnessMvtClientFramework}; use alloy::hex; use anyhow::Result; use aptos_sdk::{ @@ -12,7 +12,7 @@ use bridge_service::chains::movement::utils::{ }; use bridge_service::types::{Amount, AssetType, BridgeAddress, BridgeTransferDetails, HashLock}; use serde_json::Value; -use tracing::{debug, info}; +use tracing::debug; const FRAMEWORK_ADDRESS: AccountAddress = AccountAddress::new([ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, diff --git a/protocol-units/bridge/integration-tests/tests/bridge_e2e_test.rs b/protocol-units/bridge/integration-tests/tests/bridge_e2e_test.rs index 74f7a902c..459e71167 100644 --- a/protocol-units/bridge/integration-tests/tests/bridge_e2e_test.rs +++ b/protocol-units/bridge/integration-tests/tests/bridge_e2e_test.rs @@ -78,7 +78,7 @@ async fn test_bridge_transfer_eth_movement_happy_path() -> Result<(), anyhow::Er ) .init(); - let (eth_client_harness, mut mvt_client_harness, config) = + let (_eth_client_harness, mut mvt_client_harness, config) = TestHarness::new_with_eth_and_movement().await?; tracing::info!("Init initiator and counter part test account."); @@ -126,7 +126,7 @@ async fn test_bridge_transfer_eth_movement_happy_path() -> Result<(), anyhow::Er //send counter complete event. tracing::info!("Call counterparty_complete_bridge_transfer on MVT."); - let tx = mvt_client_harness + mvt_client_harness .counterparty_complete_bridge_transfer( recipient_privkey, bridge_tranfer_id, @@ -148,7 +148,6 @@ async fn test_bridge_transfer_eth_movement_happy_path() -> Result<(), anyhow::Er Ok(()) } -use aptos_sdk::crypto::ed25519::Ed25519PublicKey; #[tokio::test] async fn test_movement_event() -> Result<(), anyhow::Error> { tracing_subscriber::fmt() diff --git a/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs b/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs index c0162b40a..0afe0ae38 100644 --- a/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs +++ b/protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs @@ -1,24 +1,18 @@ -use alloy::{ - primitives::{address, keccak256}, - providers::Provider, -}; +use alloy::primitives::{address, keccak256}; use anyhow::Result; use aptos_sdk::types::account_address::AccountAddress; use aptos_sdk::coin_client::CoinClient; -use aptos_types::PeerId; use bridge_config::Config; -use bridge_integration_tests::utils as test_utils; use bridge_integration_tests::EthToMovementCallArgs; use bridge_integration_tests::HarnessMvtClient; use bridge_integration_tests::{TestHarness, TestHarnessFramework}; use bridge_service::chains::{ethereum::types::EthAddress, movement::client_framework::MovementClientFramework}; use bridge_service::chains::{ - bridge_contracts::{BridgeContract, BridgeContractEvent}, ethereum::types::EthHash, movement::{event_monitoring::MovementMonitoring, utils::MovementHash} + bridge_contracts::BridgeContract, ethereum::types::EthHash }; use bridge_service::types::{ Amount, AssetType, BridgeAddress, BridgeTransferId, HashLock, HashLockPreImage, }; -use futures::StreamExt; use tokio::time::{sleep, Duration}; use tokio::{self}; use tracing::info; @@ -29,7 +23,7 @@ async fn test_movement_client_lock_transfer( 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 = EthToMovementCallArgs::default(); let test_result = async { let coin_client = CoinClient::new(&mvt_client_harness.rest_client); @@ -82,7 +76,7 @@ async fn test_movement_client_complete_transfer( 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 = EthToMovementCallArgs::default(); let test_result = async { let coin_client = CoinClient::new(&mvt_client_harness.rest_client); @@ -172,7 +166,7 @@ async fn test_movement_client_abort_transfer( 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 = EthToMovementCallArgs::default(); let test_result = async { let coin_client = CoinClient::new(&mvt_client_harness.rest_client); diff --git a/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs b/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs index 3bde3d5ea..e2dccebc3 100644 --- a/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs +++ b/protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs @@ -1,21 +1,17 @@ -use alloy::primitives::keccak256; use anyhow::Result; use bridge_config::Config; -use bridge_integration_tests::utils; use bridge_integration_tests::utils as test_utils; -use bridge_integration_tests::{MovementToEthCallArgs, TestHarness, TestHarnessFramework}; -use bridge_service::chains::bridge_contracts::{BridgeContractError, BridgeContractEvent}; +use bridge_integration_tests::{MovementToEthCallArgs, TestHarnessFramework}; use bridge_service::chains::movement::client_framework::MovementClientFramework; use bridge_service::types::AssetType; use bridge_service::{ chains::{ bridge_contracts::BridgeContract, - movement::{event_monitoring::MovementMonitoring, utils::MovementHash}, + movement::utils::MovementHash, }, types::{BridgeTransferId, HashLockPreImage}, }; use chrono::Utc; -use futures::StreamExt; use tokio::time::{sleep, Duration}; use tokio::{self}; use tracing::info; @@ -25,11 +21,10 @@ async fn test_movement_client_initiate_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( @@ -170,12 +165,11 @@ async fn test_movement_client_refund_transfer() -> Result<(), anyhow::Error> { 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( diff --git a/protocol-units/bridge/service/src/chains/ethereum/client.rs b/protocol-units/bridge/service/src/chains/ethereum/client.rs index a14d7061d..5d1a52b12 100644 --- a/protocol-units/bridge/service/src/chains/ethereum/client.rs +++ b/protocol-units/bridge/service/src/chains/ethereum/client.rs @@ -6,7 +6,7 @@ use super::utils::{calculate_storage_slot, send_transaction, send_transaction_ru use crate::chains::bridge_contracts::BridgeContractError; use crate::chains::bridge_contracts::BridgeContractResult; use crate::types::{ - Amount, AssetType, BridgeAddress, BridgeTransferDetails, BridgeTransferDetailsCounterparty, BridgeTransferId, HashLock, HashLockPreImage, LockDetails, TimeLock + Amount, AssetType, BridgeAddress, BridgeTransferDetails, BridgeTransferDetailsCounterparty, BridgeTransferId, HashLock, HashLockPreImage, TimeLock }; use alloy::primitives::{Address, FixedBytes, U256}; use alloy::providers::{Provider, ProviderBuilder}; diff --git a/protocol-units/bridge/service/src/chains/movement/client.rs b/protocol-units/bridge/service/src/chains/movement/client.rs index 1ece3e38d..14f49c8b6 100644 --- a/protocol-units/bridge/service/src/chains/movement/client.rs +++ b/protocol-units/bridge/service/src/chains/movement/client.rs @@ -466,12 +466,8 @@ impl BridgeContract for MovementClient { } } -use std::{ - env, fs, - io::Write, - path::PathBuf, - process::{Command, Stdio}, -}; +use std::process::Stdio; + use tokio::{ io::{AsyncBufReadExt, BufReader}, process::Command as TokioCommand, diff --git a/protocol-units/bridge/service/src/chains/movement/client_framework.rs b/protocol-units/bridge/service/src/chains/movement/client_framework.rs index 0e24653e2..0b983e55b 100644 --- a/protocol-units/bridge/service/src/chains/movement/client_framework.rs +++ b/protocol-units/bridge/service/src/chains/movement/client_framework.rs @@ -2,13 +2,11 @@ use super::utils::{self, MovementAddress}; use crate::chains::bridge_contracts::BridgeContract; use crate::chains::bridge_contracts::BridgeContractError; use crate::chains::bridge_contracts::BridgeContractResult; -use crate::chains::ethereum::types::EthAddress; use crate::types::BridgeTransferDetailsCounterparty; use crate::types::{ - Amount, AssetType, BridgeAddress, BridgeTransferDetails, LockDetails, BridgeTransferId, HashLock, + Amount, AssetType, BridgeAddress, BridgeTransferDetails, BridgeTransferId, HashLock, HashLockPreImage, TimeLock, }; -use alloy::primitives::Address; use anyhow::{Context, Result}; use aptos_api_types::{EntryFunctionId, MoveModuleId, ViewRequest}; use aptos_sdk::{