From f233caa4d253deb865bf8a1f7583e3ad5cbf43a1 Mon Sep 17 00:00:00 2001 From: henrye Date: Mon, 25 Mar 2024 12:28:14 +0000 Subject: [PATCH] update test --- tests/openbook-twap.ts | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/openbook-twap.ts b/tests/openbook-twap.ts index 86c1c64..6bb5a23 100644 --- a/tests/openbook-twap.ts +++ b/tests/openbook-twap.ts @@ -423,22 +423,21 @@ describe("openbook-twap", () => { }) .rpc(); - let [settleFundsIx, settleFundsSigners] = await openbook.settleFundsIx( - oos[i], - await openbook.deserializeOpenOrderAccount(oos[i]), - market, - await openbook.deserializeMarketAccount(market), - metaAccount, - usdcAccount, - null, - provider.publicKey - ); - - let settleTx = new anchor.web3.Transaction().add(settleFundsIx); - [settleTx.recentBlockhash] = await banksClient.getLatestBlockhash(); - settleTx.feePayer = provider.publicKey; - - await provider.sendAndConfirm(settleTx, settleFundsSigners); + await openbookTwap.methods + .settleFundsExpired() + .accounts({ + twapMarket, + openOrdersAccount: oos[i], + market, + marketAuthority: storedMarket.marketAuthority, + marketBaseVault: storedMarket.marketBaseVault, + marketQuoteVault: storedMarket.marketQuoteVault, + userBaseAccount: metaAccount, + userQuoteAccount: usdcAccount, + tokenProgram: TOKEN_PROGRAM_ID, + openbookProgram: OPENBOOK_PROGRAM_ID, + }) + .rpc(); } // Fetch the current balance in lamports const balanceBefore = await banksClient.getBalance(