chore: fix account address iterators.

Author: l-monninger

checks/migrator/citeria/accounts-equal/src/lib.rs

@@ -30,10 +30,16 @@ impl Criterionish for AccountsEqual {
 			.await
 			.map_err(|e| CriterionError::Internal(e.into()))?;
 
-		for account_address in movement_migrator
-			.iter_accounts()
+		let movement_node =
+			movement_migrator.node().await.map_err(|e| CriterionError::Internal(e.into()))?;
+
+		for account_address in movement_node
+			.iter_account_addresses(0)
 			.map_err(|e| CriterionError::Internal(e.into()))?
 		{
+			let account_address =
+				account_address.map_err(|e| CriterionError::Internal(e.into()))?;
+
 			let movement_resource = movement_rest_client
 				.get_account_bcs(account_address)
 				.await

migration/util/migrator-types/src/migrator/movement_migrator.rs

@@ -5,7 +5,6 @@ pub use maptos_opt_executor::aptos_types::{chain_id::ChainId, state_store::TStat
 use movement_client::rest_client::Client as MovementRestClient;
 use movement_core::Movement;
 use mtma_node_types::executor::MovementNode;
-use mtma_node_types::executor::movement_executor::maptos_opt_executor::aptos_types::account_address::AccountAddress;
 
 /// An enum supporting different types of runners.
 ///
@@ -85,9 +84,4 @@ impl MovementMigrator {
 			}
 		}
 	}
-
-	/// Iterates over all accounts in the movement node.
-	pub fn iter_accounts(&self) -> Result<impl Iterator<Item = AccountAddress>, anyhow::Error> {
-		Ok(vec![].into_iter())
-	}
 }

migration/util/node-types/src/executor/movement_executor.rs

@@ -117,11 +117,11 @@ impl MovementNode {
 
 	/// Iterates over all account keys
 	/// NOTE: does this by checking all transactions and getting the [AccountAddress] signers from them
-	pub fn iter_account_keys(
+	pub fn iter_account_addresses(
 		&self,
 		start_version: u64,
-	) -> Result<AccountKeyIterator<'_>, anyhow::Error> {
-		Ok(AccountKeyIterator::new(self, start_version))
+	) -> Result<AccountAddressIterator<'_>, anyhow::Error> {
+		Ok(AccountAddressIterator::new(self, start_version))
 	}
 }
 
@@ -258,14 +258,14 @@ impl<'a> Iterator for TransactionIterator<'a> {
 	}
 }
 
-pub struct AccountKeyIterator<'a> {
+pub struct AccountAddressIterator<'a> {
 	executor: &'a MovementNode,
 	version: u64,
 	latest_version: u64,
 	current_tx_iter: Option<Box<dyn Iterator<Item = Result<AccountAddress, anyhow::Error>> + 'a>>,
 }
 
-impl<'a> AccountKeyIterator<'a> {
+impl<'a> AccountAddressIterator<'a> {
 	fn new(executor: &'a MovementNode, start_version: u64) -> Self {
 		Self {
 			executor,
@@ -323,7 +323,7 @@ impl<'a> AccountKeyIterator<'a> {
 	}
 }
 
-impl<'a> Iterator for AccountKeyIterator<'a> {
+impl<'a> Iterator for AccountAddressIterator<'a> {
 	type Item = Result<AccountAddress, anyhow::Error>;
 
 	fn next(&mut self) -> Option<Self::Item> {