[TRIVIAL] Unify eth monetary units

crates/driver/src/domain/competition/solution/fee.rs

@@ -312,19 +312,19 @@ pub enum Error {
 // todo: should be removed once integration tests are implemented
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use {super::*, number::units::EthUnit};
 
     #[test]
     fn test_adjust_quote_to_out_market_sell_order_limits() {
         let order = Order {
-            sell_amount: to_wei(20),
-            buy_amount: to_wei(19),
+            sell_amount: 20u64.eth(),
+            buy_amount: 19u64.eth(),
             side: Side::Sell,
         };
         let quote = Quote {
-            sell_amount: to_wei(21),
-            buy_amount: to_wei(18),
-            fee_amount: to_wei(1),
+            sell_amount: 21u64.eth(),
+            buy_amount: 18u64.eth(),
+            fee_amount: 1u64.eth(),
         };
         let limit = adjust_quote_to_order_limits(order.clone(), quote).unwrap();
 
@@ -334,22 +334,22 @@ mod tests {
         );
         assert_eq!(
             limit.buy.0,
-            to_wei(19),
+            19u64.eth(),
             "Buy amount should be equal to order buy amount for out of market orders"
         );
     }
 
     #[test]
     fn test_adjust_quote_to_out_market_buy_order_limits() {
         let order = Order {
-            sell_amount: to_wei(20),
-            buy_amount: to_wei(19),
+            sell_amount: 20u64.eth(),
+            buy_amount: 19u64.eth(),
             side: Side::Buy,
         };
         let quote = Quote {
-            sell_amount: to_wei(21),
-            buy_amount: to_wei(18),
-            fee_amount: to_wei(1),
+            sell_amount: 21u64.eth(),
+            buy_amount: 18u64.eth(),
+            fee_amount: 1u64.eth(),
         };
 
         let limit = adjust_quote_to_order_limits(order.clone(), quote).unwrap();
@@ -360,22 +360,22 @@ mod tests {
         );
         assert_eq!(
             limit.sell.0,
-            to_wei(20),
+            20u64.eth(),
             "Sell amount should be equal to order sell amount for out of market orders."
         );
     }
 
     #[test]
     fn test_adjust_quote_to_in_market_sell_order_limits() {
         let order = Order {
-            sell_amount: to_wei(10),
-            buy_amount: to_wei(10),
+            sell_amount: 10u64.eth(),
+            buy_amount: 10u64.eth(),
             side: Side::Sell,
         };
         let quote = Quote {
-            sell_amount: to_wei(10),
-            buy_amount: to_wei(25),
-            fee_amount: to_wei(2),
+            sell_amount: 10u64.eth(),
+            buy_amount: 25u64.eth(),
+            fee_amount: 2u64.eth(),
         };
 
         let limit = adjust_quote_to_order_limits(order.clone(), quote.clone()).unwrap();
@@ -386,38 +386,34 @@ mod tests {
         );
         assert_eq!(
             limit.buy.0,
-            to_wei(20),
+            20u64.eth(),
             "Buy amount should be equal to quoted buy amount but reduced by fee."
         );
     }
 
     #[test]
     fn test_adjust_quote_to_in_market_buy_order_limits() {
         let order = Order {
-            sell_amount: to_wei(20),
-            buy_amount: to_wei(10),
+            sell_amount: 20u64.eth(),
+            buy_amount: 10u64.eth(),
             side: Side::Buy,
         };
         let quote = Quote {
-            sell_amount: to_wei(17),
-            buy_amount: to_wei(10),
-            fee_amount: to_wei(1),
+            sell_amount: 17u64.eth(),
+            buy_amount: 10u64.eth(),
+            fee_amount: 1u64.eth(),
         };
 
         let limit = adjust_quote_to_order_limits(order.clone(), quote.clone()).unwrap();
 
         assert_eq!(
             limit.sell.0,
-            to_wei(18),
+            18u64.eth(),
             "Sell amount should match quoted buy amount increased by fee"
         );
         assert_eq!(
             limit.buy.0, order.buy_amount,
             "Buy amount should be taken from the order for buy orders in market price."
         );
     }
-
-    pub fn to_wei(base: u32) -> eth::U256 {
-        eth::U256::from(base) * eth::U256::from(10).pow(eth::U256::from(18))
-    }
 }

crates/e2e/src/setup/onchain_components/mod.rs

@@ -27,6 +27,7 @@ use {
         DomainSeparator,
         signature::{EcdsaSignature, EcdsaSigningScheme},
     },
+    number::units::EthUnit,
     secp256k1::SecretKey,
     shared::ethrpc::Web3,
     std::{borrow::BorrowMut, ops::Deref},
@@ -74,21 +75,6 @@ macro_rules! deploy {
     }};
 }
 
-pub fn to_wei_with_exp(base: u32, exp: usize) -> U256 {
-    U256::from(base) * U256::exp10(exp)
-}
-
-pub fn to_wei(base: u32) -> U256 {
-    to_wei_with_exp(base, 18)
-}
-
-/// Returns the provided Eth amount in wei.
-///
-/// Equivalent to `amount * 10^18`.
-pub fn eth(amount: u32) -> ::alloy::primitives::U256 {
-    ::alloy::primitives::U256::from(amount) * ::alloy::primitives::utils::Unit::ETHER.wei()
-}
-
 #[derive(Clone, Debug)]
 pub struct TestAccount {
     account: Account,
@@ -371,7 +357,7 @@ impl OnchainComponents {
         let forked_node_api = self.web3.api::<ForkedNodeApi<_>>();
 
         forked_node_api
-            .set_balance(&auth_manager, to_wei(100))
+            .set_balance(&auth_manager, 100u64.eth().into_legacy())
             .await
             .expect("could not set auth_manager balance");
 

crates/e2e/tests/e2e/app_data.rs

@@ -1,12 +1,16 @@
 use {
     app_data::{AppDataHash, hash_full_app_data},
-    e2e::setup::{eth, *},
-    ethrpc::alloy::{CallBuilderExt, conversions::IntoAlloy},
+    e2e::setup::*,
+    ethrpc::alloy::{
+        CallBuilderExt,
+        conversions::{IntoAlloy, IntoLegacy},
+    },
     model::{
         order::{OrderCreation, OrderCreationAppData, OrderKind},
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
         signature::EcdsaSigningScheme,
     },
+    number::units::EthUnit,
     reqwest::StatusCode,
     secp256k1::SecretKey,
     shared::ethrpc::Web3,
@@ -29,16 +33,19 @@ async fn local_node_app_data_full_format() {
 // Test that orders can be placed with the new app data format.
 async fn app_data(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3).await;
-    let [solver] = onchain.make_solvers(eth(1)).await;
-    let [trader] = onchain.make_accounts(eth(1)).await;
+    let [solver] = onchain.make_solvers(1u64.eth()).await;
+    let [trader] = onchain.make_accounts(1u64.eth()).await;
     let [token_a, token_b] = onchain
-        .deploy_tokens_with_weth_uni_v2_pools(to_wei(1_000), to_wei(1_000))
+        .deploy_tokens_with_weth_uni_v2_pools(
+            1_000u64.eth().into_legacy(),
+            1_000u64.eth().into_legacy(),
+        )
         .await;
 
-    token_a.mint(trader.address(), eth(10)).await;
+    token_a.mint(trader.address(), 10u64.eth()).await;
 
     token_a
-        .approve(onchain.contracts().allowance.into_alloy(), eth(10))
+        .approve(onchain.contracts().allowance.into_alloy(), 10u64.eth())
         .from(trader.address())
         .send_and_watch()
         .await
@@ -49,9 +56,9 @@ async fn app_data(web3: Web3) {
         let order = OrderCreation {
             app_data,
             sell_token: *token_a.address(),
-            sell_amount: eth(2),
+            sell_amount: 2u64.eth(),
             buy_token: *token_b.address(),
-            buy_amount: eth(1),
+            buy_amount: 1u64.eth(),
             valid_to,
             kind: OrderKind::Sell,
             ..Default::default()
@@ -191,16 +198,19 @@ async fn app_data(web3: Web3) {
 /// all supported features.
 async fn app_data_full_format(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3).await;
-    let [solver] = onchain.make_solvers(eth(1)).await;
-    let [trader] = onchain.make_accounts(eth(1)).await;
+    let [solver] = onchain.make_solvers(1u64.eth()).await;
+    let [trader] = onchain.make_accounts(1u64.eth()).await;
     let [token_a, token_b] = onchain
-        .deploy_tokens_with_weth_uni_v2_pools(to_wei(1_000), to_wei(1_000))
+        .deploy_tokens_with_weth_uni_v2_pools(
+            1_000u64.eth().into_legacy(),
+            1_000u64.eth().into_legacy(),
+        )
         .await;
 
-    token_a.mint(trader.address(), eth(10)).await;
+    token_a.mint(trader.address(), 10u64.eth()).await;
 
     token_a
-        .approve(onchain.contracts().allowance.into_alloy(), eth(10))
+        .approve(onchain.contracts().allowance.into_alloy(), 10u64.eth())
         .from(trader.address())
         .send_and_watch()
         .await
@@ -211,9 +221,9 @@ async fn app_data_full_format(web3: Web3) {
         let order = OrderCreation {
             app_data,
             sell_token: *token_a.address(),
-            sell_amount: eth(2),
+            sell_amount: 2u64.eth(),
             buy_token: *token_b.address(),
-            buy_amount: eth(1),
+            buy_amount: 1u64.eth(),
             valid_to,
             kind: OrderKind::Sell,
             ..Default::default()

crates/e2e/tests/e2e/app_data_signer.rs

@@ -1,11 +1,15 @@
 use {
     alloy::primitives::Address,
-    e2e::setup::{OnchainComponents, Services, TestAccount, eth, run_test, safe::Safe, to_wei},
-    ethrpc::alloy::{CallBuilderExt, conversions::IntoAlloy},
+    e2e::setup::{OnchainComponents, Services, TestAccount, run_test, safe::Safe},
+    ethrpc::alloy::{
+        CallBuilderExt,
+        conversions::{IntoAlloy, IntoLegacy},
+    },
     model::{
         order::{OrderCreation, OrderCreationAppData, OrderKind},
         signature::EcdsaSigningScheme,
     },
+    number::units::EthUnit,
     secp256k1::SecretKey,
     shared::ethrpc::Web3,
     web3::signing::SecretKeyRef,
@@ -19,24 +23,27 @@ async fn local_node_order_creation_checks_metadata_signer() {
 
 async fn order_creation_checks_metadata_signer(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3.clone()).await;
-    let [solver] = onchain.make_solvers(eth(1)).await;
-    let [trader, adversary, safe_owner] = onchain.make_accounts(eth(1)).await;
+    let [solver] = onchain.make_solvers(1u64.eth()).await;
+    let [trader, adversary, safe_owner] = onchain.make_accounts(1u64.eth()).await;
     let [token_a, token_b] = onchain
-        .deploy_tokens_with_weth_uni_v2_pools(to_wei(1_000), to_wei(1_000))
+        .deploy_tokens_with_weth_uni_v2_pools(
+            1_000u64.eth().into_legacy(),
+            1_000u64.eth().into_legacy(),
+        )
         .await;
 
-    token_a.mint(trader.address(), eth(10)).await;
+    token_a.mint(trader.address(), 10u64.eth()).await;
 
     token_a
-        .approve(onchain.contracts().allowance.into_alloy(), eth(10))
+        .approve(onchain.contracts().allowance.into_alloy(), 10u64.eth())
         .from(trader.address())
         .send_and_watch()
         .await
         .unwrap();
-    token_a.mint(adversary.address(), eth(10)).await;
+    token_a.mint(adversary.address(), 10u64.eth()).await;
 
     token_a
-        .approve(onchain.contracts().allowance.into_alloy(), eth(10))
+        .approve(onchain.contracts().allowance.into_alloy(), 10u64.eth())
         .from(adversary.address())
         .send_and_watch()
         .await
@@ -47,9 +54,9 @@ async fn order_creation_checks_metadata_signer(web3: Web3) {
         let order = OrderCreation {
             app_data,
             sell_token: *token_a.address(),
-            sell_amount: eth(2),
+            sell_amount: 2u64.eth(),
             buy_token: *token_b.address(),
-            buy_amount: eth(1),
+            buy_amount: 1u64.eth(),
             valid_to,
             kind: OrderKind::Sell,
             ..Default::default()
@@ -96,10 +103,10 @@ async fn order_creation_checks_metadata_signer(web3: Web3) {
     // EIP-1271
 
     let safe = Safe::deploy(safe_owner.clone(), web3.alloy.clone()).await;
-    token_a.mint(safe.address(), eth(10)).await;
+    token_a.mint(safe.address(), 10u64.eth()).await;
     safe.exec_alloy_call(
         token_a
-            .approve(onchain.contracts().allowance.into_alloy(), eth(10))
+            .approve(onchain.contracts().allowance.into_alloy(), 10u64.eth())
             .into_transaction_request(),
     )
     .await;