fix: tests, address comments

Signed-off-by: venilinvasilev <[email protected]>

Author: venilinvasilev

.github/workflows/flow-rust-ci.yaml

@@ -165,9 +165,11 @@ jobs:
 
       - name: Prepare Hiero Solo for DAB Tests
         id: solo-dab
-        uses: hiero-ledger/hiero-solo-action@6a1a77601cf3e69661fb6880530a4edf656b40d5 # v0.14.0
+        uses: hiero-ledger/hiero-solo-action@2576140d0c1bb084c9be2ba59e82a4604c388e06 # branch: 75-add-support-for-multiple-consensus-nodes
         with:
+          hieroVersion: v0.68.0-rc.1
           installMirrorNode: true
+          dualMode: true
 
       - name: Create env file for DAB Tests
         run: |
@@ -182,4 +184,4 @@ jobs:
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           . $HOME/.cargo/env
-          cargo test --test e2e node::update -- --nocapture
+          cargo test --test e2e node::update::updates_addressbook_and_retries_after_node_account_id_change -- --nocapture --test-threads=1

protobufs/services

@@ -639,7 +639,7 @@ impl Client {
 
     /// Triggers an immediate network update from the address book.
     /// Note: This method is not part of the public API and may be changed or removed in future versions.
-    pub(crate) async fn update_network_now(&self) {
+    pub(crate) async fn refresh_network(&self) {
         match NodeAddressBookQuery::new()
             .execute_mirrornet(self.mirrornet().load().channel(), None)
             .await

src/client/mod.rs

@@ -127,6 +127,8 @@ pub(crate) trait Execute: ValidateChecksums {
     fn response_pre_check_status(response: &Self::GrpcResponse) -> crate::Result<i32>;
 }
 
+/// The lifetime `'a` represents the lifetime of the borrowed `Client` reference.
+/// This ensures the context cannot outlive the client it references.
 struct ExecuteContext<'a> {
     // When `Some` the `transaction_id` will be regenerated when expired.
     operator_account_id: Option<AccountId>,
@@ -456,7 +458,7 @@ async fn execute_single<'a, E: Execute + Sync>(
             )))
         }
 
-        Status::InvalidNodeAccountId => {
+        Status::InvalidNodeAccount => {
             // The node account is invalid or doesn't match the submitted node
             // Mark the node as unhealthy and retry with backoff
             // This typically indicates the address book is out of date
@@ -466,8 +468,16 @@ async fn execute_single<'a, E: Execute + Sync>(
                 "Node at index {node_index} / node id {node_account_id} returned {status:?}, marking unhealthy. Updating address book before retry."
             );
 
-            // Update the network address book before retrying
-            ctx.client.update_network_now().await;
+            // Update the network address book before retrying, but only if mirror network is configured
+            if !ctx.client.mirror_network().is_empty() {
+                ctx.client.refresh_network().await;
+                log::info!("Address book updated");
+                log::info!("network: {:?}", ctx.client.network());
+            } else {
+                log::warn!(
+                    "Cannot update address book: no mirror network configured. Retrying with existing network configuration."
+                );
+            }
 
             Err(retry::Error::Transient(executable.make_error_pre_check(
                 status,

src/execute.rs

@@ -193,39 +193,3 @@ pub(crate) fn setup_nonfree() -> Option<TestEnvironment> {
         }
     }
 }
-
-/// Setup test environment for non-free tests with local 2-node network.
-/// Specifically configured for node update tests with:
-/// - Node 0.0.3 at 127.0.0.1:50211
-/// - Node 0.0.4 at 127.0.0.1:51211
-/// - Mirror network at 127.0.0.1:5600
-/// Returns None if TEST_RUN_NONFREE is not set or not on local network.
-pub(crate) fn setup_nonfree_local_two_nodes() -> Option<TestEnvironment> {
-    let _ = dotenvy::dotenv();
-    let _ = env_logger::builder().parse_default_env().is_test(true).try_init();
-
-    let config = &*CONFIG;
-
-    if !config.run_nonfree_tests {
-        log::debug!("skipping non-free test");
-        return None;
-    }
-
-    if !config.is_local {
-        log::debug!("skipping test, only runs on local network");
-        return None;
-    }
-
-    let mut network = HashMap::new();
-    network.insert("127.0.0.1:50211".to_string(), AccountId::new(0, 0, 3));
-    network.insert("127.0.0.1:51211".to_string(), AccountId::new(0, 0, 4));
-
-    let client = Client::for_network(network).unwrap();
-    client.set_mirror_network(vec!["127.0.0.1:5600".to_string()]);
-
-    if let Some(op) = &config.operator {
-        client.set_operator(op.account_id, op.private_key.clone());
-    }
-
-    Some(TestEnvironment { config, client })
-}