From 1a321b28213177582740a9a814bb22558d10abee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Tue, 28 Nov 2023 08:38:20 +0100
Subject: [PATCH] fixup! Merge branch 'tiago/outdated-eth-nonces' (#2035)

---
 apps/src/lib/node/ledger/shell/mod.rs              | 12 +++++++++---
 apps/src/lib/node/ledger/shell/prepare_proposal.rs | 10 +++++-----
 apps/src/lib/node/ledger/shell/process_proposal.rs |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/src/lib/node/ledger/shell/mod.rs b/apps/src/lib/node/ledger/shell/mod.rs
index 7735ba4ee3..8e33bf87bb 100644
--- a/apps/src/lib/node/ledger/shell/mod.rs
+++ b/apps/src/lib/node/ledger/shell/mod.rs
@@ -2410,7 +2410,7 @@ mod shell_tests {
             // sent transfers to namada nonce to 5
             .transfers_to_namada = InnerEthEventsQueue::new_at(5.into());
 
-        let (protocol_key, _, _) = wallet::defaults::validator_keys();
+        let (protocol_key, _) = wallet::defaults::validator_keys();
 
         // only bad events
         {
@@ -2432,7 +2432,10 @@ mod shell_tests {
                 .sign(&protocol_key, shell.chain_id.clone())
                 .to_bytes();
             let rsp = shell.mempool_validate(&tx, Default::default());
-            assert!(rsp.code != 0, "Validation should have failed");
+            assert!(
+                rsp.code != ErrorCodes::Ok.into(),
+                "Validation should have failed"
+            );
         }
 
         // at least one good event
@@ -2459,7 +2462,10 @@ mod shell_tests {
                 .sign(&protocol_key, shell.chain_id.clone())
                 .to_bytes();
             let rsp = shell.mempool_validate(&tx, Default::default());
-            assert!(rsp.code == 0, "Validation should have passed");
+            assert!(
+                rsp.code == ErrorCodes::Ok.into(),
+                "Validation should have passed"
+            );
         }
     }
 
diff --git a/apps/src/lib/node/ledger/shell/prepare_proposal.rs b/apps/src/lib/node/ledger/shell/prepare_proposal.rs
index 8c3a4958ed..6a4ca7ab2d 100644
--- a/apps/src/lib/node/ledger/shell/prepare_proposal.rs
+++ b/apps/src/lib/node/ledger/shell/prepare_proposal.rs
@@ -1393,7 +1393,7 @@ mod test_prepare_proposal {
             // sent transfers to namada nonce to 5
             .transfers_to_namada = InnerEthEventsQueue::new_at(5.into());
 
-        let (protocol_key, _, _) = wallet::defaults::validator_keys();
+        let (protocol_key, _) = wallet::defaults::validator_keys();
         let validator_addr = wallet::defaults::validator_address();
 
         // test an extension containing solely events with
@@ -1418,12 +1418,12 @@ mod test_prepare_proposal {
                 .sign(&protocol_key, shell.chain_id.clone())
                 .to_bytes();
             let req = RequestPrepareProposal {
-                txs: vec![tx],
+                txs: vec![tx.into()],
                 ..Default::default()
             };
             let proposed_txs =
                 shell.prepare_proposal(req).txs.into_iter().map(|tx_bytes| {
-                    Tx::try_from(tx_bytes.as_slice()).expect("Test failed")
+                    Tx::try_from(tx_bytes.as_ref()).expect("Test failed")
                 });
             // since no events with valid nonces are contained in the vote
             // extension, we drop it from the proposal
@@ -1466,12 +1466,12 @@ mod test_prepare_proposal {
                 .sign(&protocol_key, shell.chain_id.clone())
                 .to_bytes();
             let req = RequestPrepareProposal {
-                txs: vec![tx],
+                txs: vec![tx.into()],
                 ..Default::default()
             };
             let proposed_txs =
                 shell.prepare_proposal(req).txs.into_iter().map(|tx_bytes| {
-                    Tx::try_from(tx_bytes.as_slice()).expect("Test failed")
+                    Tx::try_from(tx_bytes.as_ref()).expect("Test failed")
                 });
             // find the event with the good nonce
             let mut ext = 'ext: {
diff --git a/apps/src/lib/node/ledger/shell/process_proposal.rs b/apps/src/lib/node/ledger/shell/process_proposal.rs
index 531e4edb24..7fad385eda 100644
--- a/apps/src/lib/node/ledger/shell/process_proposal.rs
+++ b/apps/src/lib/node/ledger/shell/process_proposal.rs
@@ -2136,7 +2136,7 @@ mod test_process_proposal {
             // sent transfers to namada nonce to 5
             .transfers_to_namada = InnerEthEventsQueue::new_at(5.into());
 
-        let (protocol_key, _, _) = wallet::defaults::validator_keys();
+        let (protocol_key, _) = wallet::defaults::validator_keys();
 
         // only bad events
         {