From 44266fe522c400c98e6278addd969aa2ae29ccae Mon Sep 17 00:00:00 2001 From: Richard Melkonian Date: Wed, 4 Dec 2024 22:24:23 +0000 Subject: [PATCH] update moveth tests --- .../sources/tests/MOVETH_tests.move | 58 ------------------- protocol-units/bridge/setup/src/deploy.rs | 10 +++- 2 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 protocol-units/bridge/move-modules/sources/tests/MOVETH_tests.move diff --git a/protocol-units/bridge/move-modules/sources/tests/MOVETH_tests.move b/protocol-units/bridge/move-modules/sources/tests/MOVETH_tests.move deleted file mode 100644 index b7d744379..000000000 --- a/protocol-units/bridge/move-modules/sources/tests/MOVETH_tests.move +++ /dev/null @@ -1,58 +0,0 @@ -module atomic_bridge::moveth_tests{ - #[test_only] - use atomic_bridge::moveth; - #[test_only] - use aptos_framework::fungible_asset::{Self, FungibleStore}; - #[test_only] - use aptos_framework::primary_fungible_store; - #[test_only] - use aptos_framework::object; - #[test_only] - use aptos_std::signer; - #[test_only] - use aptos_framework::dispatchable_fungible_asset; - - #[test(creator = @moveth, minter = @0xface, admin = @admin, denylister = @0xcade)] - fun test_basic_flow(creator: &signer, minter: &signer, admin: &signer, denylister: &signer) { - moveth::init_for_test(creator); - let receiver_address = @0xcafe1; - let minter_address = signer::address_of(minter); - - moveth::mint(admin, minter_address, 100); - let asset = moveth::metadata(); - assert!(primary_fungible_store::balance(minter_address, asset) == 100, 0); - - // transfer from minter to receiver, check balance - let minter_store = primary_fungible_store::ensure_primary_store_exists(minter_address, asset); - let receiver_store = primary_fungible_store::ensure_primary_store_exists(receiver_address, asset); - dispatchable_fungible_asset::transfer(minter, minter_store, receiver_store, 10); - - // denylist account, check if account is denylisted - moveth::denylist(denylister, receiver_address); - assert!(primary_fungible_store::is_frozen(receiver_address, asset), 0); - moveth::undenylist(denylister, receiver_address); - assert!(!primary_fungible_store::is_frozen(receiver_address, asset), 0); - - // burn tokens, check balance - moveth::burn(admin, minter_address, 90); - assert!(primary_fungible_store::balance(minter_address, asset) == 0, 0); - } - - //test the ability of a denylisted account to transfer out newly created store - #[test(creator = @moveth, denylister = @0xcade, receiver = @0xdead)] - #[expected_failure(abort_code = 327683, location = aptos_framework::object)] - fun test_untransferrable_store(creator: &signer, denylister: &signer, receiver: &signer) { - moveth::init_for_test(creator); - let receiver_address = signer::address_of(receiver); - let asset = moveth::metadata(); - - moveth::denylist(denylister, receiver_address); - assert!(primary_fungible_store::is_frozen(receiver_address, asset), 0); - - let constructor_ref = object::create_object(receiver_address); - fungible_asset::create_store(&constructor_ref, asset); - let store = object::object_from_constructor_ref(&constructor_ref); - - object::transfer(receiver, store, @0xdeadbeef); - } -} \ No newline at end of file diff --git a/protocol-units/bridge/setup/src/deploy.rs b/protocol-units/bridge/setup/src/deploy.rs index 1a6cf8a8e..6f4f51f19 100644 --- a/protocol-units/bridge/setup/src/deploy.rs +++ b/protocol-units/bridge/setup/src/deploy.rs @@ -11,9 +11,9 @@ use bridge_service::chains::ethereum::{ use hex::ToHex; use std::io::BufRead; use std::{ + env, io::Write, process::{Command, Stdio}, - env }; // Proxy contract to be able to call bridge contract. @@ -258,7 +258,13 @@ pub fn init_movement_node(config: &mut MovementConfig) -> Result<(), anyhow::Err pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), anyhow::Error> { tracing::info!("Before compile move modules"); let compile_output = Command::new("movement") - .args(&["move", "compile", "--package-dir", "protocol-units/bridge/move-modules/"]) + .args(&[ + "move", + "compile", + "--package-dir", + "protocol-units/bridge/move-modules/", + "--skip-fetch-latest-git-deps", + ]) .stdout(Stdio::piped()) .stderr(Stdio::piped()) .output()?;