Migrate NonZeroU256 to alloy

crates/driver/src/domain/eth/mod.rs

@@ -20,7 +20,7 @@ pub use {
     alloy::primitives::{Address, U256},
     eip712::DomainSeparator,
     gas::{EffectiveGasPrice, FeePerGas, Gas, GasPrice},
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     primitive_types::{H256, U512},
 };
 

crates/e2e/tests/e2e/app_data.rs

@@ -1,10 +1,7 @@
 use {
     app_data::{AppDataHash, hash_full_app_data},
     e2e::setup::{eth, *},
-    ethrpc::alloy::{
-        CallBuilderExt,
-        conversions::{IntoAlloy, IntoLegacy},
-    },
+    ethrpc::alloy::{CallBuilderExt, conversions::IntoAlloy},
     model::{
         order::{OrderCreation, OrderCreationAppData, OrderKind},
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
@@ -118,7 +115,7 @@ async fn app_data(web3: Web3) {
             buy_token: order3.buy_token,
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::AfterFee {
-                    value: order3.sell_amount.into_legacy().try_into().unwrap(),
+                    value: order3.sell_amount.try_into().unwrap(),
                 },
             },
             app_data: OrderCreationAppData::Hash {

crates/e2e/tests/e2e/banned_users.rs

@@ -1,6 +1,6 @@
 use {
     alloy::{
-        primitives::{Address, address},
+        primitives::{Address, U256, address, utils::Unit},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     contracts::alloy::ERC20,
@@ -96,7 +96,7 @@ async fn forked_mainnet_onchain_banned_user_test(web3: Web3) {
             buy_token: *token_usdt.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei_with_exp(1000, 18).try_into().unwrap(),
+                    value: (U256::from(1000) * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             from: BANNED_USER,

crates/e2e/tests/e2e/cow_amm.rs

@@ -1,6 +1,6 @@
 use {
     alloy::{
-        primitives::{Address, Bytes, FixedBytes, U256, address},
+        primitives::{Address, Bytes, FixedBytes, U256, address, utils::Unit},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     contracts::alloy::{
@@ -602,7 +602,7 @@ factory = "0xf76c421bAb7df8548604E60deCCcE50477C10462"
             buy_token: *usdt.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei_with_exp(1000, 6).try_into().unwrap(),
+                    value: (U256::from(1000) * Unit::MWEI.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -983,7 +983,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
         buy_token: *onchain.contracts().weth.address(),
         side: OrderQuoteSide::Sell {
             sell_amount: SellAmount::AfterFee {
-                value: NonZeroU256::try_from(executed_amount.into_legacy()).unwrap(),
+                value: NonZeroU256::try_from(executed_amount).unwrap(),
             },
         },
         ..Default::default()

crates/e2e/tests/e2e/eth_integration.rs

@@ -1,4 +1,5 @@
 use {
+    ::alloy::primitives::{U256, utils::Unit},
     e2e::setup::{eth, *},
     ethcontract::prelude::Address,
     ethrpc::alloy::{
@@ -10,7 +11,7 @@ use {
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
         signature::EcdsaSigningScheme,
     },
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     secp256k1::SecretKey,
     shared::ethrpc::Web3,
     web3::signing::SecretKeyRef,
@@ -69,7 +70,7 @@ async fn eth_integration(web3: Web3) {
                 from: Address::default().into_alloy(),
                 side: OrderQuoteSide::Sell {
                     sell_amount: SellAmount::AfterFee {
-                        value: NonZeroU256::try_from(to_wei(43)).unwrap(),
+                        value: NonZeroU256::try_from(U256::from(43) * Unit::ETHER.wei()).unwrap(),
                     },
                 },
                 ..Default::default()

crates/e2e/tests/e2e/ethflow.rs

@@ -55,7 +55,7 @@ use {
         signature::{Signature, hashed_eip712_message},
         trade::Trade,
     },
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     refunder::refund_service::{INVALIDATED_OWNER, NO_OWNER},
     reqwest::Client,
     shared::signature_validator::check_erc1271_result,
@@ -434,10 +434,7 @@ async fn test_submit_quote(
         panic!("untested!");
     };
 
-    assert_eq!(
-        response.quote.sell_amount,
-        sell_amount_after_fees.get().into_alloy()
-    );
+    assert_eq!(response.quote.sell_amount, sell_amount_after_fees.get());
 
     response
 }
@@ -862,7 +859,7 @@ impl EthFlowTradeIntent {
             },
             side: OrderQuoteSide::Sell {
                 sell_amount: model::quote::SellAmount::AfterFee {
-                    value: NonZeroU256::try_from(self.sell_amount.into_legacy()).unwrap(),
+                    value: NonZeroU256::try_from(self.sell_amount).unwrap(),
                 },
             },
             buy_token_balance: BuyTokenDestination::Erc20,

crates/e2e/tests/e2e/hooks.rs

@@ -1,5 +1,8 @@
 use {
-    alloy::providers::Provider,
+    alloy::{
+        primitives::{U256, utils::Unit},
+        providers::Provider,
+    },
     app_data::Hook,
     e2e::setup::{
         OnchainComponents,
@@ -21,7 +24,7 @@ use {
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
         signature::{EcdsaSigningScheme, Signature, hashed_eip712_message},
     },
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     reqwest::StatusCode,
     secp256k1::SecretKey,
     serde_json::json,
@@ -614,7 +617,7 @@ async fn quote_verification(web3: Web3) {
             buy_token: *onchain.contracts().weth.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: NonZeroU256::try_from(to_wei(5)).unwrap(),
+                    value: NonZeroU256::try_from(U256::from(5) * Unit::ETHER.wei()).unwrap(),
                 },
             },
             app_data: OrderCreationAppData::Full {

crates/e2e/tests/e2e/limit_orders.rs

@@ -1,7 +1,7 @@
 use {
     crate::database::AuctionTransaction,
     ::alloy::{
-        primitives::{Address, U256, address},
+        primitives::{Address, U256, address, utils::Unit},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     bigdecimal::BigDecimal,
@@ -715,7 +715,7 @@ async fn limit_does_not_apply_to_in_market_orders_test(web3: Web3) {
         buy_token: *onchain.contracts().weth.address(),
         side: OrderQuoteSide::Sell {
             sell_amount: SellAmount::BeforeFee {
-                value: NonZeroU256::try_from(to_wei(5)).unwrap(),
+                value: NonZeroU256::try_from(U256::from(5) * Unit::ETHER.wei()).unwrap(),
             },
         },
         ..Default::default()
@@ -871,7 +871,7 @@ async fn forked_mainnet_single_limit_order_test(web3: Web3) {
             buy_token: *token_usdt.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei_with_exp(1000, 6).try_into().unwrap(),
+                    value: (U256::from(1000) * Unit::MWEI.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()

crates/e2e/tests/e2e/order_cancellation.rs

@@ -1,5 +1,5 @@
 use {
-    ::alloy::primitives::U256 as AlloyU256,
+    ::alloy::primitives::{U256, utils::Unit},
     database::order_events::OrderEventLabel,
     e2e::setup::{eth, *},
     ethrpc::alloy::{CallBuilderExt, conversions::IntoAlloy},
@@ -17,7 +17,7 @@ use {
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
         signature::{EcdsaSignature, EcdsaSigningScheme},
     },
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     secp256k1::SecretKey,
     serde_json::json,
     shared::ethrpc::Web3,
@@ -95,7 +95,7 @@ async fn order_cancellation(web3: Web3) {
             buy_token: *onchain.contracts().weth.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::AfterFee {
-                    value: NonZeroU256::try_from(to_wei(1)).unwrap(),
+                    value: NonZeroU256::try_from(U256::ONE * Unit::ETHER.wei()).unwrap(),
                 },
             },
             app_data: OrderCreationAppData::Full {
@@ -110,9 +110,9 @@ async fn order_cancellation(web3: Web3) {
                 kind: quote.kind,
                 sell_token: quote.sell_token,
                 sell_amount: quote.sell_amount,
-                fee_amount: ::alloy::primitives::U256::ZERO,
+                fee_amount: U256::ZERO,
                 buy_token: quote.buy_token,
-                buy_amount: ((quote.buy_amount * AlloyU256::from(99)) / AlloyU256::from(100)),
+                buy_amount: ((quote.buy_amount * U256::from(99)) / U256::from(100)),
                 valid_to: quote.valid_to,
                 app_data: quote.app_data,
                 ..Default::default()

crates/e2e/tests/e2e/place_order_with_quote.rs

@@ -1,5 +1,5 @@
 use {
-    ::alloy::primitives::U256,
+    ::alloy::primitives::{U256, utils::Unit},
     driver::domain::eth::NonZeroU256,
     e2e::{nodes::local_node::TestNodeApi, setup::*},
     ethrpc::alloy::{CallBuilderExt, conversions::IntoAlloy},
@@ -58,7 +58,7 @@ async fn place_order_with_quote(web3: Web3) {
         .expect("Must be able to disable automine");
 
     tracing::info!("Quoting");
-    let quote_sell_amount = to_wei(1);
+    let quote_sell_amount = U256::ONE * Unit::ETHER.wei();
     let quote_request = OrderQuoteRequest {
         from: trader.address(),
         sell_token: *onchain.contracts().weth.address(),
@@ -86,7 +86,7 @@ async fn place_order_with_quote(web3: Web3) {
     let order = OrderCreation {
         quote_id: quote_response.id,
         sell_token: *onchain.contracts().weth.address(),
-        sell_amount: quote_sell_amount.into_alloy(),
+        sell_amount: quote_sell_amount,
         buy_token: *token.address(),
         buy_amount: quote_response.quote.buy_amount,
         valid_to: model::time::now_in_epoch_seconds() + 300,

crates/e2e/tests/e2e/quote_verification.rs

@@ -1,6 +1,6 @@
 use {
     ::alloy::{
-        primitives::{Address, U256, address},
+        primitives::{Address, U256, address, utils::Unit},
         providers::Provider,
     },
     bigdecimal::{BigDecimal, Zero},
@@ -15,7 +15,7 @@ use {
         order::{BuyTokenDestination, OrderKind, SellTokenSource},
         quote::{OrderQuoteRequest, OrderQuoteSide, SellAmount},
     },
-    number::nonzero::U256 as NonZeroU256,
+    number::nonzero::NonZeroU256,
     serde_json::json,
     shared::{
         price_estimation::{
@@ -113,7 +113,7 @@ async fn standard_verified_quote(web3: Web3) {
             buy_token: *onchain.contracts().weth.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -169,7 +169,7 @@ async fn test_bypass_verification_for_rfq_quotes(web3: Web3) {
                         sell_token: address!("0x2260fac5e5542a773aa44fbcfedf7c193bc2c599"),
                         buy_token: address!("0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"),
                         kind: OrderKind::Sell,
-                        in_amount: NonZeroU256::new(12.into()).unwrap(),
+                        in_amount: NonZeroU256::new(U256::from(12)).unwrap(),
                     },
                     &Verification {
                         from: address!("0x73688c2b34bf6c09c125fed02fe92d17a94b897a"),
@@ -268,7 +268,7 @@ async fn verified_quote_eth_balance(web3: Web3) {
             buy_token: *token.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -305,7 +305,7 @@ async fn verified_quote_for_settlement_contract(web3: Web3) {
         buy_token: *token.address(),
         side: OrderQuoteSide::Sell {
             sell_amount: SellAmount::BeforeFee {
-                value: to_wei(3).try_into().unwrap(),
+                value: (U256::from(3) * Unit::ETHER.wei()).try_into().unwrap(),
             },
         },
         ..Default::default()
@@ -410,7 +410,7 @@ async fn verified_quote_with_simulated_balance(web3: Web3) {
             buy_token: *weth.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -450,7 +450,7 @@ async fn verified_quote_with_simulated_balance(web3: Web3) {
             buy_token: *token.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -468,7 +468,7 @@ async fn verified_quote_with_simulated_balance(web3: Web3) {
             buy_token: *token.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()
@@ -486,7 +486,7 @@ async fn verified_quote_with_simulated_balance(web3: Web3) {
             buy_token: *token.address(),
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei(1).try_into().unwrap(),
+                    value: (U256::ONE * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             app_data: model::order::OrderCreationAppData::Full {
@@ -540,7 +540,7 @@ async fn usdt_quote_verification(web3: Web3) {
             buy_token: usdc,
             side: OrderQuoteSide::Sell {
                 sell_amount: SellAmount::BeforeFee {
-                    value: to_wei_with_exp(1000, 18).try_into().unwrap(),
+                    value: (U256::from(1000) * Unit::ETHER.wei()).try_into().unwrap(),
                 },
             },
             ..Default::default()