From 70b387c233caaa85597df19e37ac46370acda649 Mon Sep 17 00:00:00 2001 From: jfldde <168934971+jfldde@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:52:14 +0100 Subject: [PATCH] Cleanup --- .github/workflows/checks.yml | 1 + bin/citrea/src/rollup/bitcoin.rs | 1 - bin/citrea/tests/bitcoin_e2e/bitcoin.rs | 1 - bin/citrea/tests/bitcoin_e2e/config/test_case.rs | 2 +- crates/bitcoin-da/src/service.rs | 8 -------- crates/bitcoin-da/src/verifier.rs | 2 +- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 83988dd33a..39dd47fe04 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -405,6 +405,7 @@ jobs: BONSAI_API_URL: ${{ secrets.BONSAI_API_URL }} # TODO: remove this once we don't use the client on tests BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }} # TODO: remove this once we don't use the client on tests USE_DOCKER: "true" + FAST_TEST: 1 system-contracts: strategy: diff --git a/bin/citrea/src/rollup/bitcoin.rs b/bin/citrea/src/rollup/bitcoin.rs index 933c8c3077..3f9e39949b 100644 --- a/bin/citrea/src/rollup/bitcoin.rs +++ b/bin/citrea/src/rollup/bitcoin.rs @@ -122,7 +122,6 @@ impl RollupBlueprint for BitcoinRollup { ) -> Result, anyhow::Error> { let (tx, rx) = unbounded_channel::>>(); - println!("REVEAL_BATCH_PROOF_PREFIX : {REVEAL_BATCH_PROOF_PREFIX:?}"); let bitcoin_service = if require_wallet_check { BitcoinService::new_with_wallet_check( rollup_config.da.clone(), diff --git a/bin/citrea/tests/bitcoin_e2e/bitcoin.rs b/bin/citrea/tests/bitcoin_e2e/bitcoin.rs index 9762825d46..a103795b63 100644 --- a/bin/citrea/tests/bitcoin_e2e/bitcoin.rs +++ b/bin/citrea/tests/bitcoin_e2e/bitcoin.rs @@ -115,7 +115,6 @@ impl BitcoinNode { let hash = self.get_block_hash(height).await?; let block = self.get_block(&hash).await?; - println!("REVEAL_BATCH_PROOF_PREFIX : {REVEAL_BATCH_PROOF_PREFIX:?}"); Ok(get_relevant_blobs_from_txs( block.txdata, REVEAL_BATCH_PROOF_PREFIX, diff --git a/bin/citrea/tests/bitcoin_e2e/config/test_case.rs b/bin/citrea/tests/bitcoin_e2e/config/test_case.rs index 8fb7706c9f..2c98529350 100644 --- a/bin/citrea/tests/bitcoin_e2e/config/test_case.rs +++ b/bin/citrea/tests/bitcoin_e2e/config/test_case.rs @@ -15,7 +15,7 @@ pub struct TestCaseEnv { impl TestCaseEnv { // Base env that should apply to every test cases fn base_env() -> Vec<(&'static str, &'static str)> { - vec![("NO_COLOR", "1"), "FAST_TEST", "1"] + vec![("NO_COLOR", "1")] } fn test_env(&self) -> Vec<(&'static str, &'static str)> { diff --git a/crates/bitcoin-da/src/service.rs b/crates/bitcoin-da/src/service.rs index 8e85dba50e..c8bff575d7 100644 --- a/crates/bitcoin-da/src/service.rs +++ b/crates/bitcoin-da/src/service.rs @@ -660,10 +660,6 @@ impl DaService for BitcoinService { block.header.block_hash() ); - println!( - "&self.reveal_batch_prover_prefix {:?}", - &self.reveal_batch_prover_prefix - ); let txs = block.txdata.iter().map(|tx| tx.inner().clone()).collect(); get_relevant_blobs_from_txs(txs, &self.reveal_batch_prover_prefix) } @@ -678,10 +674,6 @@ impl DaService for BitcoinService { let mut completes = Vec::new(); let mut aggregate_idxs = Vec::new(); - println!( - "&self.reveal_light_client_prefix {:?}", - &self.reveal_light_client_prefix - ); for (i, tx) in block.txdata.iter().enumerate() { if !tx .compute_wtxid() diff --git a/crates/bitcoin-da/src/verifier.rs b/crates/bitcoin-da/src/verifier.rs index a7a07dcdcd..dcb7fa5d42 100644 --- a/crates/bitcoin-da/src/verifier.rs +++ b/crates/bitcoin-da/src/verifier.rs @@ -96,7 +96,7 @@ impl DaVerifier for BitcoinVerifier { let mut inclusion_iter = inclusion_proof.wtxids.iter(); let prefix = self.reveal_batch_prover_prefix.as_slice(); - println!("prefix : {prefix:?}"); + // Check starting bytes tx that parsed correctly is in blobs let mut completeness_tx_hashes = BTreeSet::new();