Skip to content
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.

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

feat: use neutronjs in sdk47 #ntrn-147 #244

Merged
merged 89 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from 86 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
e13e047
user helpers from neutronjs package
albertandrejev Jul 30, 2023
faf46b4
Update dao tests
albertandrejev Jul 31, 2023
b247e58
Move part of the tests to new helpers repo
albertandrejev Jul 31, 2023
67172ae
Update tests
albertandrejev Jul 31, 2023
edf93f2
fixes
albertandrejev Jul 31, 2023
728d58c
Update test with new package
albertandrejev Aug 1, 2023
f55cfa8
fix wrong call
albertandrejev Aug 1, 2023
b18a656
Remove not used code
albertandrejev Aug 1, 2023
042616e
Change development flow
albertandrejev Aug 3, 2023
761ec30
change neutronjs to neutronjsplus package name
albertandrejev Aug 16, 2023
93c2d4f
fix helpers usage
albertandrejev Aug 16, 2023
bcad27d
fix tests
albertandrejev Aug 16, 2023
e1dc85d
fix lint errors
albertandrejev Aug 16, 2023
db69b56
upgrade neutronjsplus version
albertandrejev Aug 16, 2023
17d590b
Add missed import
albertandrejev Aug 16, 2023
393ab17
Fix import
albertandrejev Aug 16, 2023
599df0e
Fix import
albertandrejev Aug 16, 2023
630c795
Fix imports
albertandrejev Aug 16, 2023
98a761c
and another one import fix
albertandrejev Aug 16, 2023
e285396
Fix code after rebase
albertandrejev Sep 8, 2023
f5e9e35
Merge pull request #185 from neutron-org/feat/extract-helpers-neutronjs
pr0n00gler Sep 12, 2023
e7fe7ed
add voting registry test
sotnikov-s Sep 15, 2023
522289f
add voting registry test to package.json
sotnikov-s Sep 15, 2023
6a71740
replace local imports with neutronjsplus for voting registry test
sotnikov-s Sep 18, 2023
57309bf
increase bond amount for gov test dao members
sotnikov-s Sep 19, 2023
462007d
Merge branch 'chore/adapt-dao-tests-to-new-vault' of github.com:neutr…
sotnikov-s Sep 19, 2023
889fca4
describe expected total voting power
sotnikov-s Sep 19, 2023
22cba19
describe expected total voting power
sotnikov-s Sep 19, 2023
234e781
add pause between vault add and VP check and adapt VP checks
sotnikov-s Sep 20, 2023
639d39f
decrease bond amount for dao members
sotnikov-s Sep 20, 2023
2a2e65c
reuse contractAddress instead of hardcoded address
sotnikov-s Sep 20, 2023
7b6ad41
Merge pull request #207 from neutron-org/chore/adapt-dao-tests-to-new…
pr0n00gler Sep 21, 2023
b554ba7
Merge branch 'main' of github.com:neutron-org/neutron-integration-tes…
sotnikov-s Sep 21, 2023
884b55e
add historical vp checks on schedules add/remove
sotnikov-s Sep 27, 2023
22580bd
add vesting token immutability once set tests
sotnikov-s Oct 2, 2023
aef9794
Merge pull request #209 from neutron-org/feat/improve-investors-vesti…
pr0n00gler Oct 8, 2023
0f677a7
Merge pull request #206 from neutron-org/feat/add-new-voting-registry…
pr0n00gler Oct 9, 2023
fb5a3ea
Merge branch 'main' of github.com:neutron-org/neutron-integration-tes…
sotnikov-s Oct 10, 2023
224a911
rm contracts replacement in docker compose
sotnikov-s Sep 25, 2023
a65b977
Merge pull request #214 from neutron-org/feat/disable-vesting-token-c…
pr0n00gler Oct 11, 2023
39ca1ae
backport: save failed result for proposal execution
NeverHappened Oct 12, 2023
57bf970
use new neutronjsplus version
NeverHappened Oct 12, 2023
8c1dbf5
Merge pull request #219 from neutron-org/chore/rm-contracts-replaceme…
pr0n00gler Oct 13, 2023
257f16f
Merge pull request #220 from neutron-org/feat/save-failed-result-back…
pr0n00gler Oct 13, 2023
ef805e4
bump neutronjsplus
pr0n00gler Oct 18, 2023
d7ec6db
Merge pull request #226 from neutron-org/chore/bump-neutronjsplus
pr0n00gler Oct 18, 2023
5a65409
update golang to 1.20 for gaia version to 13
NeverHappened Nov 22, 2023
2c989b5
feat: add neutronjsplus
NeverHappened Nov 22, 2023
811a3f2
chore: neutronjsplus test:simple
NeverHappened Nov 22, 2023
83d6e0b
tmp
NeverHappened Nov 22, 2023
dbdcf22
update pkg
NeverHappened Nov 22, 2023
7b810d5
use global setup
NeverHappened Nov 23, 2023
2247b5b
cleanup simple test
Nov 23, 2023
8454973
feat: migrate governance test
Nov 23, 2023
01d20fd
migrate ibc_hooks
Nov 23, 2023
bc3273f
migrate tokenomics
Nov 23, 2023
2aa8042
migrate tokenfactory test
Nov 23, 2023
4c205b3
fix interchain txs
Nov 23, 2023
49cf57f
migrated globalfee test
Nov 23, 2023
10e4876
chore: fix all tests
Nov 23, 2023
25414d5
fix interchain_kv_query test
Nov 23, 2023
480df92
migrate subdao tests
Nov 25, 2023
a6226bc
remove pob test
Nov 25, 2023
08d6f86
tmp
Nov 25, 2023
548937e
fix parameters test
Nov 25, 2023
9a022a5
fix overrule
Nov 25, 2023
7404d29
fix auction
Nov 25, 2023
bf1bdc2
remove all helpers and proto files that migrated to neutronjs
Nov 27, 2023
5732c50
adapt interchaintxquery_plain to use neutronjs
Nov 27, 2023
2a262bd
extract testExecControl back to the tests
Nov 27, 2023
b848458
fix test start
Nov 27, 2023
ada82f9
remove helpers from imports
Nov 27, 2023
8d333d7
update neutronjs plus version
Nov 27, 2023
37dc455
rename generated -> proto in neutronjs lib
Nov 27, 2023
364017a
Merge branch 'feat/upd-47' into feat/use-neutronjs
Nov 27, 2023
3c334b7
get back console
Nov 28, 2023
3dd4cfc
use neutronjsplus 0.1.0-rc0 version
Nov 28, 2023
ee20e47
fix linter
Nov 28, 2023
c895c59
update neutronjs to 0.1.0-rc1
Nov 28, 2023
c745541
Merge remote-tracking branch 'origin/feat/upd-47' into feat/use-neutr…
Nov 28, 2023
585ac78
update neutronjs to 0.1.0-rc2
Nov 28, 2023
c6036ec
update neutronjs to 0.1.0-rc3
Nov 28, 2023
3225784
Merge branch 'main' into feat/use-neutronjs
Nov 29, 2023
5f488b1
update neutronjs to 0.1.0-rc4
Nov 30, 2023
fd85142
increase minimal version of node to 16, remove non existant gen:proto…
Nov 30, 2023
6e4f09c
add test:parameters to test:run_in_band
Dec 6, 2023
36cb85d
Update src/testcases/parallel/simple.test.ts
NeverHappened Dec 7, 2023
d3a1d0d
fix unterminated string literal
Dec 7, 2023
e86a49f
update neutronjsplus version to 0.1.0
Dec 8, 2023
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
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ NO_DOCKER=1 yarn test # all tests
...
```

## Development

If you're developing integration tests and need to add additional helper methods to the @neutron-org/neutronjs packages, start by cloning the package repository. Use the command git clone [email protected]:neutron-org/neutronjs.git. After cloning, you have two options: either alter the package reference in the package.json file to point to your cloned repository, or use yarn link.

Once the JavaScript helper code in your local repository is ready, your next step is to create a Pull Request (PR). This PR must be reviewed and approved before it can be merged into the main branch.

However, even after the merge, you cannot immediately use the new package version in your integration tests. First, you need to wait until the updated version of the package will be published to the npmjs repository. After the new version has been published, you can incorporate it into your integration tests. This will allow you to complete the testing sequence in your GitHub Actions workflow.

## Warning

Since docker-compose doesn't rebuild images on file changing, there is a chance for one to launch the tests with an
Expand Down
59 changes: 0 additions & 59 deletions gen-proto-ibc-go.sh

This file was deleted.

57 changes: 0 additions & 57 deletions gen-proto-pob.sh

This file was deleted.

42 changes: 0 additions & 42 deletions gen-proto.sh

This file was deleted.

4 changes: 2 additions & 2 deletions globalSetup.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { setup } from './src/helpers/env';
import { env } from '@neutron-org/neutronjsplus';

export default async () => {
const host1 = process.env.NODE1_URL || 'http://localhost:1317';
const host2 = process.env.NODE2_URL || 'http://localhost:1316';
!process.env.NO_DOCKER && (await setup(host1, host2));
!process.env.NO_DOCKER && (await env.setup(host1, host2));
};
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "yarn test:parallel && yarn test:run_in_band",
"test:parallel": "jest -b src/testcases/parallel",
"test:run_in_band": "yarn test:tge:auction && yarn test:tge:airdrop && yarn test:tge:credits && yarn test:interchaintx && yarn test:interchain_kv_query && yarn test:interchain_tx_query_plain && yarn test:tokenomics && yarn test:reserve && yarn test:ibc_hooks && yarn test:float",
"test:run_in_band": "yarn test:tge:auction && yarn test:tge:airdrop && yarn test:tge:credits && yarn test:interchaintx && yarn test:interchain_kv_query && yarn test:interchain_tx_query_plain && yarn test:tokenomics && yarn test:reserve && yarn test:ibc_hooks && yarn test:float && yarn test:parameters",
"test:simple": "jest -b src/testcases/parallel/simple",
"test:stargate_queries": "jest -b src/testcases/parallel/stargate_queries",
"test:interchaintx": "jest -b src/testcases/run_in_band/interchaintx",
Expand All @@ -29,27 +29,29 @@
"test:tge:vesting_lp_vault": "jest -b src/testcases/parallel/tge.vesting_lp_vault",
"test:tge:credits_vault": "jest -b src/testcases/parallel/tge.credits_vault",
"test:tge:investors_vesting_vault": "jest -b src/testcases/parallel/tge.investors_vesting_vault",
"test:voting_registry": "jest -b src/testcases/parallel/voting_registry",
"test:float": "NO_WAIT_CHANNEL1=1 NO_WAIT_HTTP2=1 NO_WAIT_CHANNEL2=1 NO_WAIT_DELAY=1 jest -b src/testcases/run_in_band/float",
"gen:proto": "bash ./gen-proto.sh",
"lint": "eslint ./src",
"fmt": "eslint ./src --fix"
},
"author": "Neutron",
"license": "Apache-2.0",
"dependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
"@cosmos-client/core": "^0.47.1",
"@cosmos-client/cosmwasm": "^0.40.1",
"@cosmos-client/core": "^0.47.4",
"@cosmos-client/cosmwasm": "^0.40.3",
"@cosmos-client/ibc": "^1.2.1",
"@neutron-org/neutronjsplus": "0.1.0-rc4",
"@types/lodash": "^4.14.182",
"@types/long": "^4.0.2",
"axios": "^0.27.2",
"babel-jest": "^29.3.1",
"commander": "^10.0.0",
"date-fns": "^2.16.1",
"express": "^4.18.2",
"jest": "^27.5.1",
"jest-junit": "^15.0.0",
"jest": "^29.7.0",
"jest-junit": "^16.0.0",
"jest-extended": "^4.0.2",
"lodash": "^4.17.21",
"long": "^5.2.1",
"merkletreejs": "^0.3.9",
Expand All @@ -59,14 +61,13 @@
"@babel/preset-env": "^7.20.2",
"@babel/preset-typescript": "^7.18.6",
"@types/express": "^4.17.9",
"@types/jest": "^28.1",
"@types/jest": "^29.5",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"core-js": "^3.23.5",
"eslint": "^8.13.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.0.0",
"jest-extended": "^3.0.2",
"lint-staged": "^12.3.8",
"prettier": "^2.6.2",
"regenerator-runtime": "^0.13.9",
Expand All @@ -84,6 +85,6 @@
]
},
"engines": {
"node": ">=11.0 <17"
"node": ">=16.0 <17"
}
}
Loading