refactor(e2e): use faucet to found account in checks/migrator/criteria/transacting

Author: sebtomba

Cargo.lock

@@ -10,9 +10,11 @@ rust-version = { workspace = true }
 
 [dependencies]
 mtma-migrator-test-types = { workspace = true }
+anyhow = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-sdk = { workspace = true }
 bcs = { workspace = true }
+rand = { workspace = true }
 tokio = { workspace = true }
 
 [lints]

checks/migrator/citeria/transacting/Cargo.toml

@@ -1,3 +1,4 @@
+use anyhow::Context;
 use aptos_sdk::move_types::{
 	identifier::Identifier, language_storage::ModuleId, language_storage::TypeTag,
 };
@@ -26,7 +27,7 @@ impl MaptosTransferLifecycle {
 	}
 
 	pub fn transfer(
-		&self,
+		from_account: &LocalAccount,
 		to_account: AccountAddress,
 		amount: u64,
 		chain_id: ChainId,
@@ -41,12 +42,12 @@ impl MaptosTransferLifecycle {
 			SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() + 10,
 			chain_id,
 		)
-		.sender(self.0.address())
-		.sequence_number(self.0.sequence_number())
+		.sender(from_account.address())
+		.sequence_number(from_account.sequence_number())
 		.max_gas_amount(5_000)
 		.gas_unit_price(100);
 
-		self.0.sign_with_transaction_builder(transaction_builder)
+		from_account.sign_with_transaction_builder(transaction_builder)
 	}
 }
 
@@ -61,33 +62,57 @@ impl Criterionish for MaptosTransferLifecycle {
 			.await
 			.map_err(|e| CriterionError::Internal(e.into()))?;
 
-		// TODO: fetch the correct chain-id
-		let chain_id = ChainId::test();
+		let movement_aptos_faucet_client = movement_aptos_migrator
+			.wait_for_faucet_client_ready(tokio::time::Duration::from_secs(30))
+			.await
+			.map_err(|e| CriterionError::Internal(e.into()))?;
+
+		let alice = LocalAccount::generate(&mut rand::rngs::OsRng);
+		let bob = LocalAccount::generate(&mut rand::rngs::OsRng);
 
-		let recipient1 = AccountAddress::random();
-		let recipient2 = AccountAddress::random();
+		movement_aptos_faucet_client
+			.create_account(alice.address())
+			.await
+			.context("Failed to create Alice's account")
+			.map_err(|e| CriterionError::Internal(e.into()))?;
+
+		movement_aptos_faucet_client
+			.create_account(bob.address())
+			.await
+			.context("Failed to create Bob's account")
+			.map_err(|e| CriterionError::Internal(e.into()))?;
+
+		let chain_id = movement_aptos_rest_client
+			.get_index()
+			.await
+			.context("Failed to get chain ID")
+			.map_err(|e| CriterionError::Internal(e.into()))?
+			.inner()
+			.chain_id;
+		let chain_id = ChainId::new(chain_id);
 
-		// 1. transfer 1 MOVE to recipient1
-		let tx1 = self.transfer(recipient1, 100_000_000, chain_id);
+		// 1. transfer 1 MOVE to Alice
+		let tx1 =
+			MaptosTransferLifecycle::transfer(&self.0, alice.address(), 100_000_000, chain_id);
 
 		movement_aptos_rest_client.submit_and_wait(&tx1).await.map_err(|e| {
-			CriterionError::Unsatisfied(format!("Transfer to recipient1 failed: {:?}", e).into())
+			CriterionError::Unsatisfied(format!("Transfer to Aice failed: {:?}", e).into())
 		})?;
 
-		// 2. transfer 0 MOVE to recipient1
-		let tx2 = self.transfer(recipient1, 0, chain_id);
+		// 2. transfer 0 MOVE to Alice
+		let tx2 = MaptosTransferLifecycle::transfer(&alice, alice.address(), 0, chain_id);
 
 		movement_aptos_rest_client.submit_and_wait(&tx2).await.map_err(|e| {
 			CriterionError::Unsatisfied(
-				format!("Zero transfer to recipient1 failed: {:?}", e).into(),
+				format!("Zero transfer from Alice to Alice failed: {:?}", e).into(),
 			)
 		})?;
 
-		// 3. transfers 0.1 MOVE to recipient2
-		let tx3 = self.transfer(recipient2, 10_000_000, chain_id);
+		// 3. transfers 0.1 MOVE to Bob
+		let tx3 = MaptosTransferLifecycle::transfer(&alice, bob.address(), 10_000_000, chain_id);
 
 		movement_aptos_rest_client.submit_and_wait(&tx3).await.map_err(|e| {
-			CriterionError::Unsatisfied(format!("Transfer to recipient2 failed: {:?}", e).into())
+			CriterionError::Unsatisfied(format!("Transfer to Bob failed: {:?}", e).into())
 		})?;
 
 		Ok(())

checks/migrator/citeria/transacting/src/lib.rs

@@ -1,6 +1,8 @@
 use anyhow::Context;
 use aptos_config::config::NodeConfig;
-use aptos_rest_client::Client as MovementAptosRestClient;
+use aptos_rest_client::{
+	Client as MovementAptosRestClient, FaucetClient as MovementAptosFaucetClient,
+};
 use kestrel::WaitCondition;
 use movement_aptos_core::{runtime, MovementAptos};
 use mtma_node_types::executor::MovementAptosNode;
@@ -72,6 +74,19 @@ impl MovementAptosMigrator {
 			})?);
 		Ok(rest_client)
 	}
+	/// Waits for the rest faucet client to be ready.
+	pub async fn wait_for_faucet_client_ready(
+		&self,
+		condition: impl Into<WaitCondition>,
+	) -> Result<MovementAptosFaucetClient, anyhow::Error> {
+		// let rest_api_url = self.wait_for_rest_api_url(condition).await?;
+		// let faucet_client =
+		// 	MovementAptosFaucetClient::new(rest_api_url.parse().map_err(|e| {
+		// 		anyhow::anyhow!("failed to parse Movement Aptos rest api url: {}", e)
+		// 	})?);
+		// Ok(faucet_client)
+		todo!()
+	}
 }
 
 impl TryFrom<NodeConfig> for MovementAptosMigrator {