diff --git a/crates/common/src/dotrain_order/mod.rs b/crates/common/src/dotrain_order/mod.rs index efa1ffe46..5dc86df76 100644 --- a/crates/common/src/dotrain_order/mod.rs +++ b/crates/common/src/dotrain_order/mod.rs @@ -15,7 +15,7 @@ use rain_orderbook_app_settings::ParseConfigSourceError; use serde::{Deserialize, Serialize}; use thiserror::Error; #[cfg(target_family = "wasm")] -use wasm_bindgen_utils::{impl_wasm_traits, prelude::*}; +use wasm_bindgen_utils::prelude::*; #[derive(Debug, Clone, Serialize, Deserialize, Default)] #[cfg_attr(target_family = "wasm", wasm_bindgen)] diff --git a/crates/js_api/src/gui/order_operations.rs b/crates/js_api/src/gui/order_operations.rs index 3ce5ff6d2..f25114d6d 100644 --- a/crates/js_api/src/gui/order_operations.rs +++ b/crates/js_api/src/gui/order_operations.rs @@ -13,7 +13,6 @@ use std::{collections::HashMap, str::FromStr, sync::Arc}; pub enum CalldataFunction { Allowance, - Approval, Deposit, AddOrder, DepositAndAddOrder, @@ -99,11 +98,11 @@ pub struct ApprovalCalldata { pub calldata: Bytes, } #[cfg(target_family = "wasm")] -impl_all_wasm_traits!(ApprovalCalldata); +impl_wasm_traits!(ApprovalCalldata); #[derive(Debug)] pub struct VaultAndDeposit { - pub order_io: OrderIO, + pub order_io: OrderIOCfg, pub deposit_amount: U256, pub index: usize, } @@ -247,8 +246,6 @@ impl DotrainOrderGui { &mut self, owner: String, ) -> Result { - let deployment = self.prepare_calldata_generation(CalldataFunction::Approval)?; - let deposits_map = self.get_deposits_as_map().await?; if deposits_map.is_empty() { return Ok(ApprovalCalldataResult::NoDeposits); @@ -364,7 +361,7 @@ impl DotrainOrderGui { pub async fn generate_deposit_and_add_order_calldatas( &mut self, ) -> Result { - let deployment = self.prepare_calldata_generation(CalldataFunction::DepositAndAddOrder)?; + self.prepare_calldata_generation(CalldataFunction::DepositAndAddOrder)?; let mut calls = Vec::new(); diff --git a/packages/orderbook/test/js_api/gui.test.ts b/packages/orderbook/test/js_api/gui.test.ts index 32d3a1759..695e1fce3 100644 --- a/packages/orderbook/test/js_api/gui.test.ts +++ b/packages/orderbook/test/js_api/gui.test.ts @@ -1179,10 +1179,6 @@ ${dotrainWithoutVaultIds}`; await expect(async () => testGui.checkAllowances('0x1234567890abcdef1234567890abcdef12345678') ).rejects.toThrow('Token must be selected: token1'); - await expect( - async () => - await testGui.generateApprovalCalldatas('0x1234567890abcdef1234567890abcdef12345678') - ).rejects.toThrow('Token must be selected: token1'); await expect(async () => await testGui.generateDepositCalldatas()).rejects.toThrow( 'Token must be selected: token1' );