test: enable validate tests

silius-rs · May 27, 2023 · ecaed3e · ecaed3e
1 parent 8e296d4
commit ecaed3e
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -14,6 +14,7 @@ rust-version = "1.69.0"
 [dev-dependencies]
 aa-bundler-contracts = { path = "../crates/contracts" }
 aa-bundler-primitives = { path = "../crates/primitives" }
+aa-bundler-uopool = { path = "../crates/uopool" }
 
 anyhow = "1"
 ethers = { workspace = true }

diff --git a/tests/src/common/gen.rs b/tests/src/common/gen.rs
@@ -42,3 +42,7 @@ abigen!(
     TracerTest,
     "$CARGO_WORKSPACE_DIR/thirdparty/bundler/packages/bundler/artifacts/contracts/tests/TracerTest.sol/TracerTest.json"
 );
+abigen!(
+    TestCoin,
+    "$CARGO_WORKSPACE_DIR/thirdparty/bundler/packages/bundler/artifacts/contracts/tests/TestCoin.sol/TestCoin.json"
+);
diff --git a/tests/src/common/mod.rs b/tests/src/common/mod.rs
@@ -13,8 +13,9 @@ use ethers::{
 use tempdir::TempDir;
 
 use self::gen::{
-    EntryPointContract, TestOpcodesAccount, TestOpcodesAccountFactory, TestRecursionAccount,
-    TestRulesAccountFactory, TestStorageAccount, TestStorageAccountFactory, TracerTest,
+    EntryPointContract, TestCoin, TestOpcodesAccount, TestOpcodesAccountFactory,
+    TestRecursionAccount, TestRulesAccountFactory, TestStorageAccount, TestStorageAccountFactory,
+    TracerTest,
 };
 pub mod gen;
 
@@ -67,8 +68,9 @@ pub async fn deploy_test_opcode_account_factory<M: Middleware + 'static>(
 
 pub async fn deploy_test_storage_account_factory<M: Middleware + 'static>(
     client: Arc<M>,
+    test_coin_addr: Address,
 ) -> anyhow::Result<DeployedContract<TestStorageAccountFactory<M>>> {
-    let (factory, receipt) = TestStorageAccountFactory::deploy(client, ())?
+    let (factory, receipt) = TestStorageAccountFactory::deploy(client, test_coin_addr)?
         .send_with_receipt()
         .await?;
     let address = receipt.contract_address.unwrap();
@@ -114,6 +116,14 @@ pub async fn deploy_tracer_test<M: Middleware + 'static>(
     Ok(DeployedContract::new(factory, address))
 }
 
+pub async fn deploy_test_coin<M: Middleware + 'static>(
+    client: Arc<M>,
+) -> anyhow::Result<DeployedContract<TestCoin<M>>> {
+    let (factory, receipt) = TestCoin::deploy(client, ())?.send_with_receipt().await?;
+    let address = receipt.contract_address.unwrap();
+    Ok(DeployedContract::new(factory, address))
+}
+
 pub async fn sign(
     user_op: &mut UserOperation,
     entry_point_address: &Address,