send tests to tests folder

Makefile

@@ -321,7 +321,7 @@ test-integration:
 	./scripts/integration-test-all.sh -t "integration" -q 1 -z 1 -s 2 -m "integration" -r "true"
 
 run-integration-tests:
-	@nix-shell ./integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
+	@nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
 
 .PHONY: run-integration-tests
 

nix/testenv.nix

@@ -1,6 +1,6 @@
 { pkgs }:
 pkgs.poetry2nix.mkPoetryEnv {
-  projectDir = ../integration_tests;
+  projectDir = ../tests/integration_tests;
   python = pkgs.python39;
   overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
     eth-bloom = super.eth-bloom.overridePythonAttrs {

scripts/run-integration-tests.sh

@@ -6,7 +6,7 @@ cd "$(dirname "$0")"
 export TMPDIR=/tmp
 
 echo "build test contracts"
-cd ../integration_tests/contracts
+cd ../tests/integration_tests/contracts
 HUSKY_SKIP_INSTALL=1 npm install
 npm run typechain
 cd ..

integration_tests/configs/default.jsonnet → tests/integration_tests/configs/default.jsonnet

@@ -1,5 +1,5 @@
 {
-  dotenv: '../../scripts/.env',
+  dotenv: '../../../scripts/.env',
   'ethermintd_777-1': {
     cmd: 'ethermintd',
     'start-flags': '--trace',

integration_tests/network.py → tests/integration_tests/network.py

@@ -61,7 +61,7 @@ def __init__(self, w3):
 
 
 def setup_ethermint(path, base_port):
-    cfg = Path(__file__).parent / "../scripts/ethermint-devnet.yaml"
+    cfg = Path(__file__).parent / "../../scripts/ethermint-devnet.yaml"
     yield from setup_custom_ethermint(path, base_port, cfg)
 
 def setup_geth(path, base_port):

integration_tests/shell.nix → tests/integration_tests/shell.nix

@@ -1,8 +1,8 @@
-{ system ? builtins.currentSystem, pkgs ? import ../nix { inherit system; } }:
+{ system ? builtins.currentSystem, pkgs ? import ../../nix { inherit system; } }:
 pkgs.mkShell {
   buildInputs = [
     pkgs.jq
-    (pkgs.callPackage ../. { }) # ethermintd
+    (pkgs.callPackage ../../. { }) # ethermintd
     pkgs.start-scripts
     pkgs.go-ethereum
     pkgs.cosmovisor