Bump citrea e2e and fix tests

chainwayxyz · Dec 20, 2024 · 8607459 · 8607459
1 parent 879a075
commit 8607459
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/citrea/Cargo.toml b/bin/citrea/Cargo.toml
@@ -86,7 +86,7 @@ rustc_version_runtime = { workspace = true }
 # bitcoin-e2e dependencies
 bitcoin.workspace = true
 bitcoincore-rpc.workspace = true
-citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "c1fd14e9f0cd13f44270e4c0fdcd16002a648d56" }
+citrea-e2e = { git = "https://github.com/chainwayxyz/citrea-e2e", rev = "a4407ce0c611ed581db7e467bea3a699f43f5ce1" }
 
 [features]
 default = [] # Deviate from convention by making the "native" feature active by default. This aligns with how this package is meant to be used (as a binary first, library second).

diff --git a/bin/citrea/tests/bitcoin_e2e/prover_test.rs b/bin/citrea/tests/bitcoin_e2e/prover_test.rs
@@ -14,6 +14,7 @@ use citrea_e2e::node::NodeKind;
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::Result;
 use citrea_primitives::{REVEAL_BATCH_PROOF_PREFIX, REVEAL_LIGHT_CLIENT_PREFIX};
+use reth_primitives::U64;
 use sov_rollup_interface::da::{DaData, SequencerCommitment};
 use sov_rollup_interface::services::da::SenderWithNotifier;
 use tokio::sync::mpsc::UnboundedSender;
@@ -240,7 +241,7 @@ impl TestCase for SkipPreprovenCommitmentsTest {
         // Fetch the commitment created from the previous L1 range
         let commitments: Vec<SequencerCommitment> = full_node
             .client
-            .ledger_get_sequencer_commitments_on_slot_by_number(finalized_height)
+            .ledger_get_sequencer_commitments_on_slot_by_number(U64::from(finalized_height))
             .await
             .unwrap_or_else(|_| {
                 panic!(

diff --git a/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs b/bin/citrea/tests/bitcoin_e2e/sequencer_commitments.rs
@@ -10,6 +10,7 @@ use citrea_e2e::sequencer::Sequencer;
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::Result;
 use citrea_primitives::REVEAL_BATCH_PROOF_PREFIX;
+use reth_primitives::U64;
 use rs_merkle::algorithms::Sha256;
 use rs_merkle::MerkleTree;
 use sov_rollup_interface::da::{BlobReaderTrait, DaData};
@@ -58,7 +59,7 @@ impl TestCase for LedgerGetCommitmentsProverTest {
 
         let commitments = prover
             .client
-            .ledger_get_sequencer_commitments_on_slot_by_number(finalized_height)
+            .ledger_get_sequencer_commitments_on_slot_by_number(U64::from(finalized_height))
             .await
             .unwrap()
             .unwrap();
@@ -74,7 +75,9 @@ impl TestCase for LedgerGetCommitmentsProverTest {
 
         let commitments_hash = prover
             .client
-            .ledger_get_sequencer_commitments_on_slot_by_hash(hash.as_raw_hash().to_byte_array())
+            .ledger_get_sequencer_commitments_on_slot_by_hash(
+                hash.as_raw_hash().to_byte_array().into(),
+            )
             .await
             .unwrap()
             .unwrap();
@@ -145,7 +148,9 @@ impl TestCase for LedgerGetCommitmentsTest {
 
         let commitments_node = full_node
             .client
-            .ledger_get_sequencer_commitments_on_slot_by_hash(hash.as_raw_hash().to_byte_array())
+            .ledger_get_sequencer_commitments_on_slot_by_hash(
+                hash.as_raw_hash().to_byte_array().into(),
+            )
             .await
             .unwrap()
             .unwrap();
@@ -291,7 +296,7 @@ impl SequencerSendCommitmentsToDaTest {
             soft_confirmations.push(
                 sequencer
                     .client
-                    .ledger_get_soft_confirmation_by_number(i)
+                    .ledger_get_soft_confirmation_by_number(U64::from(i))
                     .await?
                     .unwrap(),
             );

diff --git a/bin/citrea/tests/bitcoin_e2e/sequencer_test.rs b/bin/citrea/tests/bitcoin_e2e/sequencer_test.rs
@@ -6,6 +6,7 @@ use citrea_e2e::framework::TestFramework;
 use citrea_e2e::test_case::{TestCase, TestCaseRunner};
 use citrea_e2e::traits::Restart;
 use citrea_e2e::Result;
+use reth_primitives::U64;
 
 use super::get_citrea_path;
 
@@ -110,7 +111,7 @@ impl TestCase for SequencerMissedDaBlocksTest {
         for i in 1..=head_soft_confirmation_height {
             let soft_confirmation = sequencer
                 .client
-                .ledger_get_soft_confirmation_by_number(i)
+                .ledger_get_soft_confirmation_by_number(U64::from(i))
                 .await?
                 .unwrap();