From 087536b664080307bc67c379d37fedee9810f256 Mon Sep 17 00:00:00 2001
From: 0xOsiris <djosiris@proton.me>
Date: Thu, 10 Oct 2024 11:30:23 -0700
Subject: [PATCH] fix: e2e tests

---
 world-chain-builder/src/e2e_tests/mod.rs | 10 +++-------
 world-chain-builder/src/node/builder.rs  |  2 +-
 world-chain-builder/src/pool/builder.rs  |  6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/world-chain-builder/src/e2e_tests/mod.rs b/world-chain-builder/src/e2e_tests/mod.rs
index 2742abb7..2749c03c 100644
--- a/world-chain-builder/src/e2e_tests/mod.rs
+++ b/world-chain-builder/src/e2e_tests/mod.rs
@@ -162,13 +162,9 @@ impl WorldChainBuilderTestContext {
         pbh_nonce: u16,
         tx_nonce: u64,
     ) -> Bytes {
-        let raw_tx = TransactionTestContext::transfer_tx_bytes(
-            self.node.inner.chain_spec().chain.id(),
-            signer.clone(),
-            tx_nonce,
-        )
-        .await;
-
+        let tx = tx(DEV_CHAIN_ID, None, tx_nonce);
+        let envelope = TransactionTestContext::sign_tx(signer.clone(), tx).await;
+        let raw_tx = envelope.encoded_2718();
         let mut data = raw_tx.as_ref();
         let recovered = PooledTransactionsElement::decode_enveloped(&mut data).unwrap();
         let proof = self.valid_proof(
diff --git a/world-chain-builder/src/node/builder.rs b/world-chain-builder/src/node/builder.rs
index 8bb16fc3..6d1be34d 100644
--- a/world-chain-builder/src/node/builder.rs
+++ b/world-chain-builder/src/node/builder.rs
@@ -1,11 +1,11 @@
 use std::{path::Path, sync::Arc};
 
 use eyre::eyre::Result;
-use reth_db::DatabaseEnv;
 use reth::api::{FullNodeComponents, NodeAddOns};
 use reth::builder::{
     components::ComponentsBuilder, FullNodeTypes, Node, NodeTypes, NodeTypesWithEngine,
 };
+use reth_db::DatabaseEnv;
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_node::{
     args::RollupArgs,
diff --git a/world-chain-builder/src/pool/builder.rs b/world-chain-builder/src/pool/builder.rs
index 387d0a8c..20218fba 100644
--- a/world-chain-builder/src/pool/builder.rs
+++ b/world-chain-builder/src/pool/builder.rs
@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
-use reth_db::DatabaseEnv;
 use reth::builder::components::PoolBuilder;
 use reth::builder::{BuilderContext, FullNodeTypes, NodeTypes};
+use reth::transaction_pool::blobstore::DiskFileBlobStore;
+use reth::transaction_pool::TransactionValidationTaskExecutor;
+use reth_db::DatabaseEnv;
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_node::txpool::OpTransactionValidator;
 use reth_provider::CanonStateSubscriptions;
-use reth::transaction_pool::blobstore::DiskFileBlobStore;
-use reth::transaction_pool::TransactionValidationTaskExecutor;
 use tracing::{debug, info};
 
 use crate::pool::ordering::WorldChainOrdering;