Skip to content

Commit

Permalink
feat: lock and abort client integration tests pass against framework
Browse files Browse the repository at this point in the history
  • Loading branch information
@andygolay
andygolay committed Oct 15, 2024
1 parent f7f1b12 commit b88cd6a
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 83 deletions.
2 changes: 1 addition & 1 deletion protocol-units/bridge/integration-tests/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"00000000000000000000000transfer1"),
bridge_transfer_id: MovementHash(*b"00000000000000000000000transfer4"),
hash_lock: MovementHash(*keccak256(b"secret")),
time_lock: 3600,
amount: 100,
Expand Down
212 changes: 134 additions & 78 deletions protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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;
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}
};
Expand Down Expand Up @@ -46,23 +46,83 @@ async fn test_movement_client_build_and_fund_accounts() -> Result<(), anyhow::Er
}

#[tokio::test]
async fn test_movement_client_should_publish_package() -> Result<(), anyhow::Error> {
let _ = tracing_subscriber::fmt().try_init();
async fn test_movement_client_lock_transfer(
) -> Result<(), anyhow::Error> {
let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();

let config = Config::suzuka();
let (_mvt_client_harness, _config) =
TestHarnessFramework::new_with_suzuka(config).await;
Ok(())
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 args = EthToMovementCallArgs::default();

let test_result = async {
let coin_client = CoinClient::new(&mvt_client_harness.rest_client);
let movement_client_signer = mvt_client_harness.movement_client.signer();

{
let faucet_client = mvt_client_harness.faucet_client.write().unwrap();
faucet_client.fund(movement_client_signer.address(), 100_000_000).await?;
}

let balance = coin_client.get_account_balance(&movement_client_signer.address()).await?;
assert!(
balance >= 100_000_000,
"Expected Movement Client to have at least 100_000_000, but found {}",
balance
);

mvt_client_harness
.movement_client
.lock_bridge_transfer(
BridgeTransferId(args.bridge_transfer_id.0),
HashLock(args.hash_lock.0),
BridgeAddress(args.initiator.clone()),
BridgeAddress(args.recipient.clone().into()),
Amount(AssetType::Moveth(args.amount)),
)
.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),
)
.await
.expect("Failed to get bridge transfer details")
.expect("Expected to find bridge transfer details, but got None");

info!("Bridge transfer details: {:?}", details);
Ok(())
}
.await;

test_result
}

#[tokio::test]
async fn test_movement_client_complete_transfer(
) -> Result<(), anyhow::Error> {
let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();

let config = Config::suzuka();
let (mut mvt_client_harness, config) =
TestHarnessFramework::new_with_suzuka(config).await;
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 args = EthToMovementCallArgs::default();

Expand Down Expand Up @@ -95,29 +155,26 @@ async fn test_movement_client_complete_transfer(
.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),
)
.await
.expect("Failed to get bridge transfer details")
.expect("Expected to find bridge transfer details, but got None");

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 mut mvt_monitoring = MovementMonitoring::build(&config.movement).await.unwrap();
let event =
tokio::time::timeout(std::time::Duration::from_secs(30), mvt_monitoring.next()).await?;
let bridge_transfer_id = if let Some(Ok(BridgeContractEvent::Locked(detail))) = event {
detail.bridge_transfer_id
} else {
panic!("Not a Locked event: {event:?}");
};

info!("Bridge transfer id: {:?}", bridge_transfer_id);
//assert_eq!(details.bridge_transfer_id.0, args.bridge_transfer_id.0);
//assert_eq!(details.hash_lock.0, args.hash_lock.0);
//assert_eq!(
// &details.initiator_address.0 .0[32 - args.initiator.len()..],
// &args.initiator,
// "Initiator address does not match"
//);
//assert_eq!(details.recipient_address.0, args.recipient.0.to_vec());
//assert_eq!(details.amount.0, AssetType::Moveth(args.amount));
//assert_eq!(details.state, 1, "Bridge transfer is supposed to be locked but it's not.");


let secret = b"secret";
let mut padded_secret = [0u8; 32];
padded_secret[..secret.len()].copy_from_slice(secret);
Expand Down Expand Up @@ -157,13 +214,17 @@ async fn test_movement_client_complete_transfer(
}

#[tokio::test]
async fn test_movement_client_should_abort_transfer() -> Result<(), anyhow::Error>
{
async fn test_movement_client_abort_transfer(
) -> Result<(), anyhow::Error> {
let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();

let config = Config::suzuka();
let (mut mvt_client_harness, config) =
TestHarnessFramework::new_with_suzuka(config).await;
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 args = EthToMovementCallArgs::default();

Expand All @@ -183,80 +244,75 @@ async fn test_movement_client_should_abort_transfer() -> Result<(), anyhow::Erro
balance
);

// Set the timelock to 1 second for testing
//mvt_client_harness
// .movement_client
// .counterparty_set_timelock(1)
// .await
// .expect("Failed to set timelock");

mvt_client_harness
.movement_client
.lock_bridge_transfer(
BridgeTransferId(args.bridge_transfer_id.0),
HashLock(args.hash_lock.0),
BridgeAddress(args.initiator.clone()),
BridgeAddress(args.recipient.clone()),
BridgeAddress(args.recipient.clone().into()),
Amount(AssetType::Moveth(args.amount)),
)
.await
.expect("Failed to lock bridge transfer");

//Wait for the tx to be executed
tracing::info!("Wait for the MVT initiated event.");

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 mut mvt_monitoring = MovementMonitoring::build(&config.movement).await.unwrap();
let event =
tokio::time::timeout(std::time::Duration::from_secs(30), mvt_monitoring.next()).await?;
let bridge_transfer_id = if let Some(Ok(BridgeContractEvent::Locked(detail))) = event {
detail.bridge_transfer_id
} else {
panic!("Not a Locked event: {event:?}");
};

info!("Bridge transfer id: {:?}", bridge_transfer_id);
//assert_eq!(details.bridge_transfer_id.0, args.bridge_transfer_id.0);
//assert_eq!(details.hash_lock.0, args.hash_lock.0);
//assert_eq!(
// &details.initiator_address.0 .0[32 - args.initiator.len()..],
// &args.initiator,
// "Initiator address does not match"
//);
//assert_eq!(details.recipient_address.0, args.recipient.0.to_vec());
//assert_eq!(details.amount.0, AssetType::Moveth(args.amount));
//assert_eq!(details.state, 1, "Bridge transfer is supposed to be locked but it's not."); sleep(Duration::from_secs(5)).await;
let details = BridgeContract::get_bridge_transfer_details_counterparty(
&mut mvt_client_harness.movement_client,
BridgeTransferId(bridge_transfer_id),
)
.await
.expect("Failed to get bridge transfer details")
.expect("Expected to find bridge transfer details, but got None");

mvt_client_harness
.movement_client
.abort_bridge_transfer(BridgeTransferId(args.bridge_transfer_id.0))
.await
.expect("Failed to complete bridge transfer");
info!("Bridge transfer details: {:?}", details);

assert_eq!(details.state, 1, "Bridge transfer should be pending.");

let abort_details = BridgeContract::get_bridge_transfer_details_counterparty(
sleep(Duration::from_secs(20)).await;

let secret = b"secret";
let mut padded_secret = [0u8; 32];
padded_secret[..secret.len()].copy_from_slice(secret);

BridgeContract::abort_bridge_transfer(
&mut mvt_client_harness.movement_client,
BridgeTransferId(args.bridge_transfer_id.0)
)
.await
.expect("Failed to complete bridge transfer");

let details = BridgeContract::get_bridge_transfer_details_counterparty(
&mut mvt_client_harness.movement_client,
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!(abort_details.bridge_transfer_id.0, args.bridge_transfer_id.0);
assert_eq!(abort_details.hash_lock.0, args.hash_lock.0);
assert_eq!(details.bridge_transfer_id.0, args.bridge_transfer_id.0);
assert_eq!(details.hash_lock.0, args.hash_lock.0);
assert_eq!(
&abort_details.initiator_address.0,
&details.initiator_address.0,
&args.initiator,
"Initiator address does not match"
);
assert_eq!(abort_details.recipient_address.0, args.recipient);
assert_eq!(abort_details.amount.0, AssetType::Moveth(args.amount));
assert_eq!(details.recipient_address.0, args.recipient);
assert_eq!(details.amount.0, AssetType::Moveth(args.amount));
assert_eq!(details.state, 3, "Bridge transfer is supposed to be cancelled but it's not.");

Ok(())
}
.await;

test_result
}

#[tokio::test]
async fn test_eth_client_should_build_and_fetch_accounts() {
let config = Config::default();
Expand Down
4 changes: 0 additions & 4 deletions protocol-units/bridge/integration-tests/tests/client_l2move_l1move.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,9 @@ async fn test_movement_client_build_and_fund_accounts() -> Result<(), anyhow::Er
#[tokio::test]
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 args = MovementToEthCallArgs::default();

let test_result = async {
Expand Down
2 changes: 2 additions & 0 deletions protocol-units/bridge/move-modules/scripts/update_bridge_operator.move
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
script {
use aptos_framework::aptos_account;
use aptos_framework::aptos_governance;
use aptos_framework::atomic_bridge_configuration;

fun update_bridge_operator(core_resources: &signer, new_operator: address) {
let framework_signer = aptos_governance::get_signer_testnet_only(core_resources, @aptos_framework);
atomic_bridge_configuration::update_bridge_operator(&framework_signer, new_operator);
aptos_account::create_account(@0x00000000000000000000000000face);
}
}

0 comments on commit b88cd6a

Please sign in to comment.