Skip to content

Commit

Permalink
Merge pull request #212 from terra-money/refact/v2.7/ibchooks
Browse files Browse the repository at this point in the history
test(2.8): ibc hooks
  • Loading branch information
tuky191 authored Nov 28, 2023
2 parents 18ba913 + ce9ba83 commit bf22f10
Show file tree
Hide file tree
Showing 26 changed files with 376 additions and 1,245 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,6 @@ init-test-framework: clean-testing-data install
@echo "Testing relayer..."
./scripts/tests/relayer/interchain-acc-config/rly-init.sh

test-ibc-hooks:
@echo "Testing ibc hooks..."
./scripts/tests/ibc-hooks/increment.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 @@ -5,4 +5,5 @@ module.exports = {
testMatch: ['**/*.test.ts'],
verbose: true,
testTimeout: 30000,
maxConcurrency: 3,
};
14 changes: 7 additions & 7 deletions integration-tests/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Integration tests for Core using feather.js",
"main": "index.ts",
"scripts": {
"test": "jest --maxConcurrency=4"
"test": "jest"
},
"repository": {
"type": "git",
Expand All @@ -30,7 +30,7 @@
"typescript": "^5.2.2"
},
"dependencies": {
"@terra-money/feather.js": "^2.0.0-beta.12",
"@terra-money/feather.js": "^2.0.0-beta.13",
"@terra-money/terra.proto": "^4.0.1",
"moment": "^2.29.4"
}
Expand Down
5 changes: 4 additions & 1 deletion integration-tests/src/helpers/const.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
export const SAFE_VOTING_PERIOD_TIME = 4100;
export const SAFE_IBC_TRANSFER = 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));
export const ibcTransfer = () => new Promise((resolve) => setTimeout(() => resolve(SAFE_IBC_TRANSFER), SAFE_IBC_TRANSFER));
export const votingPeriod = () => new Promise((resolve) => setTimeout(() => resolve(SAFE_VOTING_PERIOD_TIME), SAFE_VOTING_PERIOD_TIME));
2 changes: 2 additions & 0 deletions integration-tests/src/helpers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
SAFE_VOTING_PERIOD_TIME,
blockInclusion,
votingPeriod,
ibcTransfer,
} from "./const"
import { getMnemonics } from "./mnemonics"
import { getLCDClient } from "./lcd.connection"
Expand All @@ -12,6 +13,7 @@ export {
SAFE_VOTING_PERIOD_TIME,
blockInclusion,
votingPeriod,
ibcTransfer,
getMnemonics,
getLCDClient
}
6 changes: 5 additions & 1 deletion integration-tests/src/helpers/mnemonics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ export function getMnemonics() {
let tokenFactoryMnemonic = new MnemonicKey({
mnemonic: "year aim panel oyster sunny faint dress skin describe chair guilt possible venue pottery inflict mass debate poverty multiply pulse ability purse situate inmate"
})
let ibcHooksMnemonic = new MnemonicKey({
mnemonic: "leave side blue panel curve ancient suspect slide seminar neutral doctor boring only curious spell surround remind obtain slogan hire giant soccer crunch system"
})

return {
val1,
Expand All @@ -55,6 +58,7 @@ export function getMnemonics() {
genesisVesting,
genesisVesting1,
icaMnemonic,
tokenFactoryMnemonic
tokenFactoryMnemonic,
ibcHooksMnemonic
}
}
152 changes: 0 additions & 152 deletions integration-tests/src/modules/authz.test.ts

This file was deleted.

Loading

0 comments on commit bf22f10

Please sign in to comment.