chore(tests): update decider test to changes in Nox (#275)

fluencelabs · Jul 18, 2024 · 768af12 · 768af12
1 parent 1484eb4
commit 768af12
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -40,7 +40,6 @@ jobs:
 
     uses: fluencelabs/nox/.github/workflows/build.yml@master
     with:
-      ref: update-to-lightweight-decider
       cargo-dependencies: |
         [
           {
@@ -66,4 +65,3 @@ jobs:
     uses: fluencelabs/cli/.github/workflows/tests.yml@main
     with:
       nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
-      ref: change-nox-config
diff --git a/src/tests/decider-distro-tests-rs/tests/utils/chain.rs b/src/tests/decider-distro-tests-rs/tests/utils/chain.rs
@@ -253,21 +253,35 @@ pub async fn play_register_worker_gen(server: &mut ServerHandle, tx_hash: &Optio
         assert_eq!(method, "eth_maxPriorityFeePerGas");
         server.send_response(Ok(json!(max_priority_fee)));
     }
-    {
-        let (method, _params) = server.receive_request().await.unwrap();
-        assert_eq!(method, "eth_getTransactionCount");
-        server.send_response(Ok(json!(nonce)));
-    }
 
+    // eth_getTransactionCount is now optional, so we may meet sendRawTransaction without getting
+    // nonce
     {
         let (method, _params) = server.receive_request().await.unwrap();
-        assert_eq!(method, "eth_sendRawTransaction");
-        let reply = if let Some(tx_hash) = tx_hash {
-            Ok(json!(tx_hash))
-        } else {
-            Err(json!("no tx hash provided"))
-        };
-        server.send_response(reply);
+        match method.as_ref() {
+            "eth_sendRawTransaction" => {
+                let reply = if let Some(tx_hash) = tx_hash {
+                    Ok(json!(tx_hash))
+                } else {
+                    Err(json!("no tx hash provided"))
+                };
+                server.send_response(reply);
+            }
+            "eth_getTransactionCount" => {
+                server.send_response(Ok(json!(nonce)));
+                {
+                    let (method, _params) = server.receive_request().await.unwrap();
+                    assert_eq!(method, "eth_sendRawTransaction");
+                    let reply = if let Some(tx_hash) = tx_hash {
+                        Ok(json!(tx_hash))
+                    } else {
+                        Err(json!("no tx hash provided"))
+                    };
+                    server.send_response(reply);
+                }
+            }
+            _ => panic!("unexpected method: {method}, expected eth_getTransactionCount or eth_sendRawTransaction"),
+        }
     }
 }