diff --git a/.codecov.yml b/.codecov.yml index 02822ff766..ee13027e9f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -45,7 +45,6 @@ flags: ignore: - "cmd/" - - "contrib/" - "docs/" - "docker/" - "scripts/" diff --git a/Makefile b/Makefile index bba0a5c51a..90814a3c65 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ ldflags := $(strip $(ldflags)) BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(ldflags)' -trimpath # The below include contains the tools and runsim targets. -include contrib/devtools/Makefile +include scripts/contrib/devtools/Makefile all: install lint test diff --git a/README.md b/README.md index 6b59332236..9a0dfe6f71 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ Generate protobuf make proto-gen ``` -The generators are executed within a Docker [container](./contrib/prototools-docker), now. +The generators are executed within a Docker [container](./scripts/contrib/prototools-docker), now. ## Dockerized diff --git a/contrib/devtools/Makefile b/scripts/contrib/devtools/Makefile similarity index 100% rename from contrib/devtools/Makefile rename to scripts/contrib/devtools/Makefile diff --git a/contrib/devtools/README.md b/scripts/contrib/devtools/README.md similarity index 100% rename from contrib/devtools/README.md rename to scripts/contrib/devtools/README.md diff --git a/contrib/local/01-accounts.sh b/scripts/contrib/local/01-accounts.sh similarity index 100% rename from contrib/local/01-accounts.sh rename to scripts/contrib/local/01-accounts.sh diff --git a/contrib/local/02-contracts.sh b/scripts/contrib/local/02-contracts.sh similarity index 100% rename from contrib/local/02-contracts.sh rename to scripts/contrib/local/02-contracts.sh diff --git a/contrib/local/03-grpc-queries.sh b/scripts/contrib/local/03-grpc-queries.sh similarity index 100% rename from contrib/local/03-grpc-queries.sh rename to scripts/contrib/local/03-grpc-queries.sh diff --git a/contrib/local/04-gov.sh b/scripts/contrib/local/04-gov.sh similarity index 100% rename from contrib/local/04-gov.sh rename to scripts/contrib/local/04-gov.sh diff --git a/contrib/local/README.md b/scripts/contrib/local/README.md similarity index 76% rename from contrib/local/README.md rename to scripts/contrib/local/README.md index 234e442f46..6f0ea24303 100644 --- a/contrib/local/README.md +++ b/scripts/contrib/local/README.md @@ -6,7 +6,7 @@ For manual testing. Works on my box(*) ... ``` make install -cd contrib/local +cd scripts/contrib/local rm -rf /tmp/trash HOME=/tmp/trash bash setup_wasmd.sh HOME=/tmp/trash bash start_node.sh @@ -15,9 +15,9 @@ HOME=/tmp/trash bash start_node.sh Next shell: ``` -cd contrib/local -./01-accounts.sh -./02-contracts.sh +cd scripts/contrib/local +HOME=/tmp/trash bash 01-accounts.sh +HOME=/tmp/trash bash 02-contracts.sh ``` ## Shell script development diff --git a/contrib/local/setup_wasmd.sh b/scripts/contrib/local/setup_wasmd.sh similarity index 100% rename from contrib/local/setup_wasmd.sh rename to scripts/contrib/local/setup_wasmd.sh diff --git a/contrib/local/start_node.sh b/scripts/contrib/local/start_node.sh similarity index 100% rename from contrib/local/start_node.sh rename to scripts/contrib/local/start_node.sh diff --git a/contrib/prometheus/README.md b/scripts/contrib/prometheus/README.md similarity index 89% rename from contrib/prometheus/README.md rename to scripts/contrib/prometheus/README.md index 398973c617..acbf2de7d8 100644 --- a/contrib/prometheus/README.md +++ b/scripts/contrib/prometheus/README.md @@ -38,7 +38,7 @@ Note the `format` parameter in the request for the endpoint: ## Run Prometheus ```sh # port 9090 is used by wasmd already -docker run -it -v $(pwd)/contrib/prometheus:/prometheus -p9091:9090 prom/prometheus --config.file=/prometheus/prometheus.yaml +docker run -it -v $(pwd)/scripts/contrib/prometheus:/prometheus -p9091:9090 prom/prometheus --config.file=/prometheus/prometheus.yaml ``` * Open [console](http://localhost:9091) and find `wasm_`service metrics diff --git a/contrib/prometheus/prometheus.yaml b/scripts/contrib/prometheus/prometheus.yaml similarity index 100% rename from contrib/prometheus/prometheus.yaml rename to scripts/contrib/prometheus/prometheus.yaml diff --git a/contrib/prototools-docker/Dockerfile b/scripts/contrib/prototools-docker/Dockerfile similarity index 100% rename from contrib/prototools-docker/Dockerfile rename to scripts/contrib/prototools-docker/Dockerfile diff --git a/contrib/prototools-docker/README.md b/scripts/contrib/prototools-docker/README.md similarity index 87% rename from contrib/prototools-docker/README.md rename to scripts/contrib/prototools-docker/README.md index 600c7024b8..3c8ef4b7a7 100644 --- a/contrib/prototools-docker/README.md +++ b/scripts/contrib/prototools-docker/README.md @@ -13,7 +13,7 @@ Installs generators and tools from: ### Build ```shell script -docker build -t cosmwasm/prototools-docker -f ./contrib/prototools-docker/Dockerfile . +docker build -t cosmwasm/prototools-docker -f ./scripts/contrib/prototools-docker/Dockerfile . ``` ```shell script diff --git a/contrib/relayer-tests/.gitignore b/scripts/contrib/relayer-tests/.gitignore similarity index 100% rename from contrib/relayer-tests/.gitignore rename to scripts/contrib/relayer-tests/.gitignore diff --git a/contrib/relayer-tests/README.md b/scripts/contrib/relayer-tests/README.md similarity index 84% rename from contrib/relayer-tests/README.md rename to scripts/contrib/relayer-tests/README.md index 199b00a493..38fef2668b 100644 --- a/contrib/relayer-tests/README.md +++ b/scripts/contrib/relayer-tests/README.md @@ -1,7 +1,7 @@ # Relayer tests These scripts helps to test go-relayer with two local wasmd chains. \ -Make sure you run below scripts under `wasmd/contrib/relayer-tests` directory. +Make sure you run below scripts under `wasmd/scripts/contrib/relayer-tests` directory. - `./init_two_chainz_relayer.sh` will spin two chains and runs - `./one_chain.sh` will spin a single chain. This script used by the one above diff --git a/contrib/relayer-tests/configs/wasmd/chains/ibc-0.json b/scripts/contrib/relayer-tests/configs/wasmd/chains/ibc-0.json similarity index 100% rename from contrib/relayer-tests/configs/wasmd/chains/ibc-0.json rename to scripts/contrib/relayer-tests/configs/wasmd/chains/ibc-0.json diff --git a/contrib/relayer-tests/configs/wasmd/chains/ibc-1.json b/scripts/contrib/relayer-tests/configs/wasmd/chains/ibc-1.json similarity index 100% rename from contrib/relayer-tests/configs/wasmd/chains/ibc-1.json rename to scripts/contrib/relayer-tests/configs/wasmd/chains/ibc-1.json diff --git a/contrib/relayer-tests/configs/wasmd/paths/demo.json b/scripts/contrib/relayer-tests/configs/wasmd/paths/demo.json similarity index 100% rename from contrib/relayer-tests/configs/wasmd/paths/demo.json rename to scripts/contrib/relayer-tests/configs/wasmd/paths/demo.json diff --git a/contrib/relayer-tests/init_two_chainz_relayer.sh b/scripts/contrib/relayer-tests/init_two_chainz_relayer.sh similarity index 100% rename from contrib/relayer-tests/init_two_chainz_relayer.sh rename to scripts/contrib/relayer-tests/init_two_chainz_relayer.sh diff --git a/contrib/relayer-tests/one_chain.sh b/scripts/contrib/relayer-tests/one_chain.sh similarity index 100% rename from contrib/relayer-tests/one_chain.sh rename to scripts/contrib/relayer-tests/one_chain.sh diff --git a/contrib/relayer-tests/test_ibc_transfer.sh b/scripts/contrib/relayer-tests/test_ibc_transfer.sh similarity index 100% rename from contrib/relayer-tests/test_ibc_transfer.sh rename to scripts/contrib/relayer-tests/test_ibc_transfer.sh