Merge branch 'andygolay/framework-client-tests' of https://github.com/movementlabsxyz/movement into andygolay/framework-client-tests

Author: andygolay

protocol-units/bridge/integration-tests/README.md

@@ -7,122 +7,38 @@ The client integration tests for the framework bridge modules are in `tests`:
 
 In order to successfully run the tests against a local Suzuka node, the core resource account `0xA550C18` needs to be set to the same private key generated in `config.json`.
 
-## Steps to configure core resource account for signing in tests:
+## Steps to run integration tests
 
-1. From the root of the `movement` repository, run the local Suzuka node:
+1. Navigate to the root of the `movement` repo, checkout the `andygolay/framework-client-tests` branch, and start a local Suzuka node:
 
 ```
 CELESTIA_LOG_LEVEL=FATAL CARGO_PROFILE=release CARGO_PROFILE_FLAGS=--release nix develop --extra-experimental-features nix-command --extra-experimental-features flakes --command bash  -c "just bridge native build.setup.eth-local.celestia-local --keep-tui"
 ```
 
-(You'll need Nix and Movement CLI if you don't already have them installed.)
+Note, if you have any `.movement` directories present, e.g. when re-running tests, the directories must be deleted before starting the node. 
 
-This will generate a `.movement` dir in the project root containing a `config.json` with a `maptos_private_key` of `0x1`:
-```
-      "maptos_private_key": "0x0000000000000000000000000000000000000000000000000000000000000001",
-```
-
-There will also be a `config.yaml` that looks something like:
+2. In the generated `.movement` directory, there will be a `config.yaml`. In that file, change `f90391c81027f03cdea491ed8b36ffaced26b6df208a9b569e5baf2590eb9b16` to `0xA550C18` so the file looks like:
 
 ```
 ---
 profiles:
   default:
-    network: Custom
-    private_key: "0x5754431205b8abc443a7a877a70d6e5e67eba8e5e40b0436bff5a9b6ab4a7887"
-    public_key: "0x2b8c073bf4c091649d8fb5c275cacc6c8cf8cb6baaf0d7dffc47216011b6a27d"
-    account: e813b12fc00bed33b54b5652c3bb1cbf12a33080aba9cd12d919b6d65cec6115
-    rest_url: "http://localhost:30731/v1"
-    faucet_url: "http://localhost:30732/"
-```
-
-2. Init a profile with the `0x1` private key. Here we init a profile named `local_root`:
-
-```
-movement init --profile local_root --rest-url http://localhost:30731/v1 --private-key 0x0000000000000000000000000000000000000000000000000000000000000001 --encoding hex --network custom
-```
-
-3. In `config.yaml` replace the `account` of `local_root` with `000000000000000000000000000000000000000000000000000000000a550c18` and skip the faucet step by pressing Enter when prompted. Your `config.yaml` will look like this:
-
-```
----
-profiles:
-  default:
-    network: Custom
-    private_key: "<some-private-key>"
-    public_key: "0x2b8c073bf4c091649d8fb5c275cacc6c8cf8cb6baaf0d7dffc47216011b6a27d"
-    account: e813b12fc00bed33b54b5652c3bb1cbf12a33080aba9cd12d919b6d65cec6115
-    rest_url: "http://localhost:30731/v1"
-    faucet_url: "http://localhost:30732/"
-  local_root:
     network: Custom
     private_key: "0x0000000000000000000000000000000000000000000000000000000000000001"
     public_key: "0x4cb5abf6ad79fbf5abbccafcc269d85cd2651ed4b885b5869f241aedf0a5ba29"
-    account: 000000000000000000000000000000000000000000000000000000000a550c18
-    rest_url: "http://localhost:30731/v1"
-```
+    account: "0xA550C18"
+    rest_url: "http://0.0.0.0:30731/"
+    faucet_url: "http://0.0.0.0:30732/"
+``` 
 
-4. List the contents of the `0xa550c18` account:
+3. Run each set of Movement client tests:
 
+L1 Move to L2 Move:
 ```
- movement account list --account 0xA550C18
+rust_backtrace=1 cargo test --test client_l1move_l2move -- --nocapture --test-threads=1
 ```
 
-You should see a large number of `AptosCoin` held by the account:
-
-```
-{
-      "0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>": {
-        "coin": {
-          "value": "18446743973709450015"
-        },
-        "deposit_events": {
-          "counter": "1",
-          "guid": {
-            "id": {
-              "addr": "0xa550c18",
-              "creation_num": "2"
-            }
-          }
-        },
-        "frozen": false,
-        "withdraw_events": {
-          "counter": "1",
-          "guid": {
-            "id": {
-              "addr": "0xa550c18",
-              "creation_num": "3"
-            }
-          }
-        }
-      }
-    }
+L2 Move to L1 Move:
 ```
-
-This large number of gas coins signifies that this is the core resource account.
-
-5. Verify that you control the core resources signer by transferring gas tokens to your default account:
-
-```
-movement account transfer --profile local_root --amount 100 --account e813b12fc00bed33b54b5652c3bb1cbf12a33080aba9cd12d919b6d65cec6115
-```
-
-You'll be prompted to submit a transaction. After doing so, if the transaction is successful, you'll get a success message and transaction result.
-
-## Steps to run client integration tests
-
-Now that the core resource signer is configured, you can run the client integration tests.
-
-There are two scripts in `protocol-units/bridge/move-modules`, one for enabling the Atomic Bridge feature flag and one for updating bridge operator.
-
-1. Compile the scripts:
-
-```
-movement move compile --package-dir protocol-units/bridge/move-modules
-```
-
-2. Run the `enable_bridge_feature` script:
-
+rust_backtrace=1 cargo test --test client_l2move_l1move -- --nocapture --test-threads=1
 ```
- movement move run-script --compiled-script-path protocol-units/bridge/move-modules/build/bridge-modules/bytecode_scripts/enable_bridge_feature.mv --profile local_root
- ```

protocol-units/bridge/integration-tests/src/lib.rs

@@ -65,7 +65,9 @@ impl Default for EthToMovementCallArgs {
                 bridge_transfer_id.extend_from_slice(random_suffix.as_bytes());
 
                 Self {
+			// Dummy valid EIP-55 address used in framework modules
                         initiator: b"32Be343B94f860124dC4fEe278FDCBD38C102D88".to_vec(),
+			// Dummy recipient address
                         recipient: MovementAddress(AccountAddress::new(*b"0x00000000000000000000000000face")),
                         // Convert to [u8; 32] with explicit type annotation
                         bridge_transfer_id: MovementHash(

protocol-units/bridge/integration-tests/tests/client_l1move_l2move.rs

@@ -27,17 +27,10 @@ use tracing::info;
 async fn test_movement_client_lock_transfer(
 ) -> Result<(), anyhow::Error> {
 	let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();
-
-	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();
@@ -86,7 +79,6 @@ async fn test_movement_client_lock_transfer(
 #[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 _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();
 	MovementClientFramework::bridge_setup_scripts().await?;
 	let config: Config = Config::suzuka();
@@ -100,6 +92,7 @@ async fn test_movement_client_complete_transfer(
 			faucet_client.fund(movement_client_signer.address(), 100_000_000).await?;
 			faucet_client.fund(AccountAddress::from_hex_literal("0xface")?, 100_000_000).await?;
 			faucet_client.fund(AccountAddress::from_hex_literal("0x1")?, 100_000_000).await?;
+			// This address is the recipient in test_movement_client_complete_transfer, so it needs an AptosCoin store
 			faucet_client.fund(AccountAddress::from_hex_literal("0x3078303030303030303030303030303030303030303030303030303066616365")?, 100_000_000).await?;
 
 		}
@@ -177,17 +170,10 @@ async fn test_movement_client_complete_transfer(
 async fn test_movement_client_abort_transfer(
 ) -> Result<(), anyhow::Error> {
 	let _ = tracing_subscriber::fmt().with_max_level(tracing::Level::DEBUG).try_init();
-
-	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();
@@ -266,32 +252,6 @@ async fn test_movement_client_abort_transfer(
 
 	test_result
 }
-#[tokio::test]
-async fn test_eth_client_should_build_and_fetch_accounts() {
-	let config = Config::default();
-	let (eth_client_harness, _config, _anvil) = TestHarness::new_only_eth(config).await;
-
-	let expected_accounts = [
-		address!("f39fd6e51aad88f6f4ce6ab8827279cfffb92266"),
-		address!("70997970c51812dc3a010c7d01b50e0d17dc79c8"),
-		address!("3c44cdddb6a900fa2b585dd299e03d12fa4293bc"),
-		address!("90f79bf6eb2c4f870365e785982e1f101e93b906"),
-		address!("15d34aaf54267db7d7c367839aaf71a00a2c6a65"),
-		address!("9965507d1a55bcc2695c58ba16fb37d819b0a4dc"),
-		address!("976ea74026e726554db657fa54763abd0c3a0aa9"),
-		address!("14dc79964da2c08b23698b3d3cc7ca32193d9955"),
-		address!("23618e81e3f5cdf7f54c3d65f7fbc0abf5b21e8f"),
-		address!("a0ee7a142d267c1f36714e4a8f75612f20a79720"),
-	];
-
-	let provider = eth_client_harness.rpc_provider().await;
-	let accounts = provider.get_accounts().await.expect("Failed to get accounts");
-	assert_eq!(accounts.len(), expected_accounts.len());
-
-	for (account, expected) in accounts.iter().zip(expected_accounts.iter()) {
-		assert_eq!(account, expected);
-	}
-}
 
 #[tokio::test]
 async fn test_eth_client_should_deploy_initiator_contract() {