change to vault prop all functions

rainlanguage · Feb 3, 2025 · f39aec5 · f39aec5
1 parent cb14802
commit f39aec5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/crates/js_api/src/subgraph/vault.rs b/crates/js_api/src/subgraph/vault.rs
@@ -54,18 +54,15 @@ pub async fn get_vault_balance_changes(
 /// Returns a string of the calldata
 #[wasm_bindgen(js_name = "getVaultDepositCalldata")]
 pub async fn get_vault_deposit_calldata(
-    token_address: &str,
-    vault_id: &str,
+    vault: &Vault,
     deposit_amount: &str,
 ) -> Result<JsValue, SubgraphError> {
     let deposit_amount = validate_amount(deposit_amount)?;
-    let token = Address::from_str(token_address)?;
-    let vault_id = U256::from_str(vault_id)?;
 
     let deposit_args = DepositArgs {
-        token,
-        amount: deposit_amount,
-        vault_id,
+            token: Address::from_str(&vault.token.address.0)?,
+            vault_id: U256::from_str(&vault.vault_id.0)?,
+            amount: deposit_amount,
     };
 
     Ok(to_value(&Bytes::copy_from_slice(
@@ -74,7 +71,6 @@ pub async fn get_vault_deposit_calldata(
 }
 
 /// Get withdraw calldata for a vault
-/// Returns a string of the calldata
 #[wasm_bindgen(js_name = "getVaultWithdrawCalldata")]
 pub async fn get_vault_withdraw_calldata(
     vault: &Vault,

diff --git a/packages/orderbook/test/js_api/vault.test.ts b/packages/orderbook/test/js_api/vault.test.ts
@@ -238,8 +238,7 @@ describe('Rain Orderbook JS API Package Bindgen Vault Tests', async function ()
 		await mockServer.forPost('/sg4').thenReply(200, JSON.stringify({ data: { order } }));
 
 		let calldata: string = await getVaultDepositCalldata(
-			vault1.token.address,
-			vault1.vaultId,
+			vault1,
 			'500'
 		);
 		assert.equal(calldata.length, 330);
@@ -250,7 +249,7 @@ describe('Rain Orderbook JS API Package Bindgen Vault Tests', async function ()
 
 		await assert.rejects(
 			async () => {
-				await getVaultDepositCalldata(vault1.token.address, vault1.vaultId, '0');
+				await getVaultDepositCalldata(vault1, '0');
 			},
 			{ message: 'Invalid amount' }
 		);
@@ -259,7 +258,7 @@ describe('Rain Orderbook JS API Package Bindgen Vault Tests', async function ()
 	it('should throw error for invalid deposit amount', async () => {
 		await assert.rejects(
 			async () => {
-				await getVaultDepositCalldata(vault1.token.address, vault1.vaultId, '-100');
+				await getVaultDepositCalldata(vault1, '-100');
 			},
 			{ message: 'invalid digit: -' }
 		);