Skip to content

Updated test to use permissioned cranks #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jarry-xiao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated test to use permissioned cranks #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/serum-dex
Open in desktop
Submodule serum-dex updated 14 files
+20 −4 .travis.yml
+416 −262 Cargo.lock
+13 −0 dex/Anchor.toml
+77 −24 dex/Cargo.lock
+3 −3 dex/Cargo.toml
+7 −4 dex/crank/src/lib.rs
+127 −20 dex/fuzz/Cargo.lock
+1 −1 dex/fuzz/fuzz_targets/multiple_orders.rs
+2 −1 dex/fuzz/src/lib.rs
+41 −1 dex/src/instruction.rs
+1 −1 dex/src/lib.rs
+62 −25 dex/src/matching.rs
+207 −20 dex/src/state.rs
+1 −0 dex/src/tests.rs
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"homepage": "https://github.com/project-serum/permissioned-markets-quickstart#readme",
"devDependencies": {
"@project-serum/anchor": "^0.13.2",
"@project-serum/anchor-cli": "^0.13.2",
"@project-serum/anchor": "^0.14.0",
"@project-serum/anchor-cli": "^0.14.0",
"@project-serum/common": "^0.0.1-beta.3",
"@project-serum/serum": "^0.13.55",
"@solana/spl-token": "^0.1.6",
Expand Down
18 changes: 16 additions & 2 deletions tests/permissioned-markets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ describe("permissioned-markets", () => {

// Need to crank the cancel so that we can close later.
it("Cranks the cancel transaction", async () => {
await crankEventQueue(provider, marketProxy);
await crankEventQueuePermissioned(provider, marketProxy);
});

it("Closes an open orders account", async () => {
Expand Down Expand Up @@ -304,7 +304,7 @@ describe("permissioned-markets", () => {
});

it("Cranks the prune transaction", async () => {
await crankEventQueue(provider, marketProxy);
await crankEventQueuePermissioned(provider, marketProxy);
});

it("Closes an open orders account", async () => {
Expand Down Expand Up @@ -349,3 +349,17 @@ async function crankEventQueue(provider, marketProxy) {
eq = await marketProxy.market.loadEventQueue(provider.connection);
}
}

async function crankEventQueuePermissioned(provider, marketProxy) {
// TODO: can do this in a single transaction if we covert the pubkey bytes
// into a [u64; 4] array and sort. I'm lazy though.
let eq = await marketProxy.market.loadEventQueue(provider.connection);
while (eq.length > 0) {
const tx = new Transaction();
tx.add(
marketProxy.market.makeConsumeEventsPermissionedInstruction([eq[0].openOrders], provider.wallet.publicKey, 1)
);
await provider.send(tx);
eq = await marketProxy.market.loadEventQueue(provider.connection);
}
}
1 change: 1 addition & 0 deletions tests/utils/market-lister.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ async function list({
DEX_PID,
proxyProgramId
),
consumeEventsAuthority: wallet.publicKey,
})
);

Expand Down
8 changes: 7 additions & 1 deletion tests/utils/market-maker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,13 @@ async function initOpenOrders(provider, marketProxy, marketMakerAccounts) {
)
);
let signers = [marketMakerAccounts.account];
await provider.send(tx, signers);
try {
await provider.send(tx, signers);
}
catch (e) {
console.log("failed to generate OOA");
throw e;
}
}

async function postOrders(provider, marketProxy, marketMakerAccounts) {
Expand Down
Loading