Skip to content

Commit

Permalink
Merge pull request #191 from terra-money/feat/alliance/tests
Browse files Browse the repository at this point in the history
tests: alliance & gov v1
  • Loading branch information
emidev98 authored Oct 23, 2023
2 parents 5e5eae0 + f7406ce commit 62957f0
Show file tree
Hide file tree
Showing 10 changed files with 700 additions and 210 deletions.
5 changes: 0 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ integration-test-all: init-test-framework \
test-ica \
test-ibc-hooks \
test-vesting-accounts \
test-alliance \
test-tokenfactory

init-test-framework: clean-testing-data install
Expand All @@ -225,10 +224,6 @@ test-ibc-hooks:
@echo "Testing ibc hooks..."
./scripts/tests/ibc-hooks/increment.sh

test-alliance:
@echo "Testing alliance module..."
./scripts/tests/alliance/delegate.sh

test-tokenfactory:
@echo "Testing tokenfactory..."
./scripts/tests/tokenfactory/tokenfactory.sh
Expand Down
1 change: 1 addition & 0 deletions integration-tests/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ module.exports = {
testEnvironment: 'node',
testMatch: ['**/*.test.ts'],
verbose: true,
testTimeout: 30000,
};
204 changes: 101 additions & 103 deletions integration-tests/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@terra-money/feather.js": "^1.1.3",
"@terra-money/feather.js": "^2.0.0-beta.1",
"@terra-money/terra.proto": "^4.0.1",
"moment": "^2.29.4"
}
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/src/helpers/const.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
export const SAFE_VOTING_PERIOD_TIME = 4100;
export const SAFE_BLOCK_INCLUSION_TIME = 1100;
export const blockInclusion = () => new Promise((resolve) => setTimeout(()=>resolve(SAFE_BLOCK_INCLUSION_TIME), SAFE_BLOCK_INCLUSION_TIME));
export const votingPeriod = () => new Promise((resolve) => setTimeout(()=>resolve(SAFE_VOTING_PERIOD_TIME), SAFE_VOTING_PERIOD_TIME));
7 changes: 4 additions & 3 deletions integration-tests/src/helpers/mnemonics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ export function getMnemonics() {
})

// Funded wallets available in both chains
let allianceMnemonic = new MnemonicKey({
mnemonic: "broken title little open demand ladder mimic keen execute word couple door relief rule pulp demand believe cactus swing fluid tired what crop purse"
})
let pobMnemonic = new MnemonicKey({
mnemonic: "banner spread envelope side kite person disagree path silver will brother under couch edit food venture squirrel civil budget number acquire point work mass"
})
Expand All @@ -34,9 +37,6 @@ export function getMnemonics() {
mnemonic: "open attitude harsh casino rent attitude midnight debris describe spare cancel crisp olive ride elite gallery leaf buffalo sheriff filter rotate path begin soldier"
})
// let mnemonic = new MnemonicKey({
// mnemonic: "broken title little open demand ladder mimic keen execute word couple door relief rule pulp demand believe cactus swing fluid tired what crop purse"
// })
// let mnemonic = new MnemonicKey({
// mnemonic: "unit question bulk desk slush answer share bird earth brave book wing special gorilla ozone release permit mercy luxury version advice impact unfair drama"
// })
// let mnemonic = new MnemonicKey({
Expand All @@ -48,6 +48,7 @@ export function getMnemonics() {
rly1,
val2,
rly2,
allianceMnemonic,
feeshareMnemonic,
pobMnemonic,
pobMnemonic1,
Expand Down
Loading

0 comments on commit 62957f0

Please sign in to comment.