From 0e3a7752d97a6bf3518e6217e3113584bd19a9fe Mon Sep 17 00:00:00 2001 From: Dana Date: Wed, 29 Sep 2021 18:01:23 -0400 Subject: [PATCH] share test stuff --- .gitignore | 2 +- Anchor.toml | 20 +++++++++++++++++++ README.md | 2 ++ programs/reward-pool/Cargo.toml | 2 +- programs/reward-pool/src/lib.rs | 4 ++-- ...hdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36.json | 1 + ...G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json | 1 + tests/reward-pool.js | 2 +- 8 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 tests/keys/prog-TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36.json create mode 100644 tests/keys/xstep-tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json diff --git a/.gitignore b/.gitignore index 8059a76..090f330 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ target test-ledger **/*.rs.bk -keys/ +/keys/ .rustc_info.json debug/ node_modules diff --git a/Anchor.toml b/Anchor.toml index 5b26d40..41d9784 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,6 +1,26 @@ +anchor_version = "0.16.2" + +[workspace] +members = ["programs/reward-pool"] + +[registry] +url = "https://anchor.projectserum.com" + [provider] cluster = "localnet" wallet = "~/.config/solana/id.json" [scripts] test = "mocha -t 1000000 tests/" + +[programs.localnet] +reward_pool = "TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36" + +#[programs.devnet] +#reward_pool = "UNKNOWN" + +#[programs.testnet] +#reward_pool = "UNKNOWN" + +#[programs.mainnet] +#reward_pool = "UNKNOWN" \ No newline at end of file diff --git a/README.md b/README.md index 4598e70..2789159 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,8 @@ can be deterministically generated with docker. ### Test +When testing locally, be sure to build with feature "local-testing" to enable the testing IDs. You can do this by editing `programs/step-staking/Cargo.toml` and uncommenting the default feature set line. + ``` anchor test ``` diff --git a/programs/reward-pool/Cargo.toml b/programs/reward-pool/Cargo.toml index 6ac2b23..8db79f7 100644 --- a/programs/reward-pool/Cargo.toml +++ b/programs/reward-pool/Cargo.toml @@ -13,7 +13,7 @@ no-entrypoint = [] cpi = ["no-entrypoint"] #add to default for local testing -default = ["local-testing"] +#default = ["local-testing"] local-testing = [] [dependencies] diff --git a/programs/reward-pool/src/lib.rs b/programs/reward-pool/src/lib.rs index 275a61d..0c4c10a 100644 --- a/programs/reward-pool/src/lib.rs +++ b/programs/reward-pool/src/lib.rs @@ -8,7 +8,7 @@ use std::convert::TryInto; #[cfg(not(feature = "local-testing"))] declare_id!("UNKNOWN" fail build ); #[cfg(feature = "local-testing")] -declare_id!("SRWdZfXVSH7usoNVGAMBMpTnRf4PDQWRCtd3ZLUYDsP"); +declare_id!("TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36"); #[cfg(not(feature = "local-testing"))] mod constants { @@ -19,7 +19,7 @@ mod constants { #[cfg(feature = "local-testing")] mod constants { - pub const X_STEP_TOKEN_MINT_PUBKEY: &str = "xsTPvEj7rELYcqe2D1k3M5zRe85xWWFK3x1SWDN5qPY"; + pub const X_STEP_TOKEN_MINT_PUBKEY: &str = "tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s"; pub const X_STEP_DEPOSIT_REQUIREMENT: u64 = 10_000_000_000_000; pub const MIN_DURATION: u64 = 1; } diff --git a/tests/keys/prog-TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36.json b/tests/keys/prog-TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36.json new file mode 100644 index 0000000..d03bf79 --- /dev/null +++ b/tests/keys/prog-TeSTKchdpa2FKNV6gYNAENpququb3aT2r1pD41tZw36.json @@ -0,0 +1 @@ +[99,88,159,24,211,86,41,8,220,47,170,72,113,8,235,248,163,245,155,116,136,37,0,234,29,195,51,32,107,84,14,97,6,211,110,235,255,101,133,147,157,75,55,231,230,2,30,58,113,250,121,172,228,125,95,21,9,28,194,76,18,158,209,1] \ No newline at end of file diff --git a/tests/keys/xstep-tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json b/tests/keys/xstep-tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json new file mode 100644 index 0000000..9818f2a --- /dev/null +++ b/tests/keys/xstep-tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json @@ -0,0 +1 @@ +[189,65,246,88,57,128,70,1,53,105,104,67,55,128,210,188,81,117,180,44,137,15,53,94,186,60,127,245,98,220,241,179,13,32,77,211,54,104,98,71,147,164,12,225,147,190,146,162,246,165,174,16,157,170,173,120,22,111,46,157,85,216,114,148] \ No newline at end of file diff --git a/tests/reward-pool.js b/tests/reward-pool.js index 08ab892..9acc830 100644 --- a/tests/reward-pool.js +++ b/tests/reward-pool.js @@ -53,7 +53,7 @@ describe('Multiuser Reward Pool', () => { console.log("Wallet: ", provider.wallet.publicKey.toString()); //this is the xstep token //test xstep token hardcoded in program, mint authority is itself - rawdata = fs.readFileSync('tests/keys/TESTING-xsTPvEj7rELYcqe2D1k3M5zRe85xWWFK3x1SWDN5qPY.json'); + rawdata = fs.readFileSync('tests/keys/xstep-tEsTL8G8drugWztoCKrPpEAXV21qEajfHg4q45KYs6s.json'); keyData = JSON.parse(rawdata); xMintKey = anchor.web3.Keypair.fromSecretKey(new Uint8Array(keyData)); xMintPubkey = xMintKey.publicKey;