Migrate GasHog to alloy (cowprotocol#3761)

Author: jmg-duarte

crates/contracts/build.rs

@@ -1030,9 +1030,6 @@ fn main() {
     // Test Contract for incrementing arbitrary counters.
     generate_contract("Counter");
 
-    // Test Contract for using up a specified amount of gas.
-    generate_contract("GasHog");
-
     // Contract for Uniswap's Permit2 contract.
     generate_contract_with_config("Permit2", |builder| {
         builder

crates/contracts/src/alloy.rs

@@ -613,6 +613,11 @@ pub mod support {
     );
 }
 
+pub mod test {
+    // Test Contract for using up a specified amount of gas.
+    crate::bindings!(GasHog);
+}
+
 pub use alloy::providers::DynProvider as Provider;
 
 /// Extension trait to attach some useful functions to the contract instance.

crates/contracts/src/lib.rs

@@ -97,7 +97,6 @@ pub mod support {
 pub mod test {
     include_contracts! {
         Counter;
-        GasHog;
     }
 }
 

crates/e2e/tests/e2e/smart_contract_orders.rs

@@ -1,10 +1,10 @@
 use {
-    e2e::{
-        setup::{eth, safe::Safe, *},
-        tx,
-    },
+    e2e::setup::{eth, safe::Safe, *},
     ethcontract::{Bytes, H160, U256},
-    ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
+    ethrpc::alloy::{
+        CallBuilderExt,
+        conversions::{IntoAlloy, IntoLegacy},
+    },
     model::{
         order::{OrderCreation, OrderCreationAppData, OrderKind, OrderStatus, OrderUid},
         signature::Signature,
@@ -156,8 +156,7 @@ async fn erc1271_gas_limit(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3.clone()).await;
 
     let [solver] = onchain.make_solvers(to_wei(1)).await;
-    let trader = contracts::test::GasHog::builder(&web3)
-        .deploy()
+    let trader = contracts::alloy::test::GasHog::Instance::deploy(web3.alloy.clone())
         .await
         .unwrap();
 
@@ -166,11 +165,17 @@ async fn erc1271_gas_limit(web3: Web3) {
         .await;
 
     // Fund trader accounts and approve relayer
-    cow.fund(trader.address(), to_wei(5)).await;
-    tx!(
-        solver.account(),
-        trader.approve(cow.address(), onchain.contracts().allowance, to_wei(10))
-    );
+    cow.fund(trader.address().into_legacy(), to_wei(5)).await;
+    trader
+        .approve(
+            cow.address().into_alloy(),
+            onchain.contracts().allowance.into_alloy(),
+            eth(10),
+        )
+        .from(solver.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
 
     let services = Services::new(&onchain).await;
     services
@@ -195,7 +200,7 @@ async fn erc1271_gas_limit(web3: Web3) {
         valid_to: model::time::now_in_epoch_seconds() + 300,
         kind: OrderKind::Sell,
         signature: Signature::Eip1271(signature.to_vec()),
-        from: Some(trader.address()),
+        from: Some(trader.address().into_legacy()),
         ..Default::default()
     };