Merge pull request #191 from terra-money/feat/alliance/tests

tests: alliance & gov v1
terra-money · Oct 23, 2023 · 62957f0 · 62957f0
2 parents 5e5eae0 + f7406ce
commit 62957f0
Show file tree

Hide file tree

Showing 10 changed files with 700 additions and 210 deletions.
diff --git a/Makefile b/Makefile
@@ -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
@@ -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

diff --git a/integration-tests/jest.config.js b/integration-tests/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
   testEnvironment: 'node',
   testMatch: ['**/*.test.ts'],
   verbose: true,
+  testTimeout: 30000,
 };
diff --git a/integration-tests/package-lock.json b/integration-tests/package-lock.json
diff --git a/integration-tests/package.json b/integration-tests/package.json
@@ -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"
   }

diff --git a/integration-tests/src/helpers/const.ts b/integration-tests/src/helpers/const.ts
@@ -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));
diff --git a/integration-tests/src/helpers/mnemonics.ts b/integration-tests/src/helpers/mnemonics.ts
@@ -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"
     })
@@ -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({
@@ -48,6 +48,7 @@ export function getMnemonics() {
         rly1,
         val2,
         rly2,
+        allianceMnemonic,
         feeshareMnemonic,
         pobMnemonic,
         pobMnemonic1,