From ef99be483dc2959149655c9a87bfb6cdb8bb9fca Mon Sep 17 00:00:00 2001 From: willclarktech Date: Thu, 3 Jun 2021 13:31:04 +0200 Subject: [PATCH] cosmwasm-stargate: Remove proto scripts --- packages/cosmwasm-stargate/.gitignore | 3 -- packages/cosmwasm-stargate/package.json | 4 +-- .../cosmwasm-stargate/scripts/define-proto.sh | 31 ------------------- .../cosmwasm-stargate/scripts/get-proto.sh | 31 ------------------- 4 files changed, 1 insertion(+), 68 deletions(-) delete mode 100755 packages/cosmwasm-stargate/scripts/define-proto.sh delete mode 100755 packages/cosmwasm-stargate/scripts/get-proto.sh diff --git a/packages/cosmwasm-stargate/.gitignore b/packages/cosmwasm-stargate/.gitignore index 5d19789f2f..d983d1c558 100644 --- a/packages/cosmwasm-stargate/.gitignore +++ b/packages/cosmwasm-stargate/.gitignore @@ -1,7 +1,4 @@ build/ dist/ docs/ - -# protobuf code generation -proto/ tmp/ diff --git a/packages/cosmwasm-stargate/package.json b/packages/cosmwasm-stargate/package.json index 9d575bf24b..4b3c2292af 100644 --- a/packages/cosmwasm-stargate/package.json +++ b/packages/cosmwasm-stargate/package.json @@ -34,9 +34,7 @@ "test-chrome": "yarn pack-web && karma start --single-run --browsers ChromeHeadless", "test": "yarn build-or-skip && yarn test-node", "coverage": "nyc --reporter=text --reporter=lcov yarn test --quiet", - "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js", - "get-proto": "rm -rf proto && WASM_REF=v0.16.0-alpha2 COSMOS_SDK_REF=v0.42.4 ./scripts/get-proto.sh", - "define-proto": "./scripts/define-proto.sh && prettier --write \"src/codec/**/*.ts\"" + "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js" }, "dependencies": { "@cosmjs/amino": "workspace:packages/amino", diff --git a/packages/cosmwasm-stargate/scripts/define-proto.sh b/packages/cosmwasm-stargate/scripts/define-proto.sh deleted file mode 100755 index 04d8972812..0000000000 --- a/packages/cosmwasm-stargate/scripts/define-proto.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -o pipefail -command -v shellcheck >/dev/null && shellcheck "$0" - -ROOT_PROTO_DIR="./proto" -COSMOS_PROTO_DIR="$ROOT_PROTO_DIR/cosmos/cosmos-sdk/proto" -THIRD_PARTY_PROTO_DIR="$ROOT_PROTO_DIR/cosmos/cosmos-sdk/third_party/proto" -WASMD_PROTO_DIR="$ROOT_PROTO_DIR/cosmwasm/wasmd/proto" -OUT_DIR="./src/codec/" - -mkdir -p "$OUT_DIR" - -protoc \ - --plugin="$(yarn bin protoc-gen-ts_proto)" \ - --ts_proto_out="$OUT_DIR" \ - --proto_path="$COSMOS_PROTO_DIR" \ - --proto_path="$THIRD_PARTY_PROTO_DIR" \ - --proto_path="$WASMD_PROTO_DIR" \ - --ts_proto_opt="esModuleInterop=true,forceLong=long,useOptionals=true" \ - "$WASMD_PROTO_DIR/cosmwasm/wasm/v1beta1/types.proto" \ - "$WASMD_PROTO_DIR/cosmwasm/wasm/v1beta1/query.proto" \ - "$WASMD_PROTO_DIR/cosmwasm/wasm/v1beta1/tx.proto" \ - "$COSMOS_PROTO_DIR/cosmos/base/v1beta1/coin.proto" \ - "$COSMOS_PROTO_DIR/cosmos/base/query/v1beta1/pagination.proto" - -# Remove unnecessary codec files -rm -rf \ - src/codec/cosmos_proto/ \ - src/codec/gogoproto/ \ - src/codec/google/api/ \ - src/codec/google/protobuf/descriptor.ts diff --git a/packages/cosmwasm-stargate/scripts/get-proto.sh b/packages/cosmwasm-stargate/scripts/get-proto.sh deleted file mode 100755 index 77dd072524..0000000000 --- a/packages/cosmwasm-stargate/scripts/get-proto.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -o errexit -o nounset -o pipefail -command -v shellcheck >/dev/null && shellcheck "$0" - -PROTO_DIR="./proto" - -COSMOS_DIR="$PROTO_DIR/cosmos" -COSMOS_SDK_DIR="$COSMOS_DIR/cosmos-sdk" -COSMOS_SDK_ZIP_FILE="$COSMOS_DIR/tmp.zip" -COSMOS_SDK_REF=${COSMOS_SDK_REF:-"master"} -COSMOS_SUFFIX=${COSMOS_SDK_REF} -[[ $COSMOS_SUFFIX =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]] && COSMOS_SUFFIX=${COSMOS_SUFFIX#v} - -COSMWASM_DIR="$PROTO_DIR/cosmwasm" -WASMD_DIR="$COSMWASM_DIR/wasmd" -WASMD_ZIP_FILE="$COSMWASM_DIR/tmp.zip" -WASM_REF=${WASM_REF:-"master"} -WASM_SUFFIX=${WASM_REF} -[[ $WASM_SUFFIX =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]] && WASM_SUFFIX=${WASM_SUFFIX#v} - -mkdir -p "$COSMOS_DIR" -wget -qO "$COSMOS_SDK_ZIP_FILE" "https://github.com/cosmos/cosmos-sdk/archive/$COSMOS_SDK_REF.zip" -unzip "$COSMOS_SDK_ZIP_FILE" "*.proto" -d "$COSMOS_DIR" -mv "$COSMOS_SDK_DIR-$COSMOS_SUFFIX" "$COSMOS_SDK_DIR" -rm "$COSMOS_SDK_ZIP_FILE" - -mkdir -p "$COSMWASM_DIR" -wget -qO "$WASMD_ZIP_FILE" "https://github.com/cosmwasm/wasmd/archive/$WASM_REF.zip" -unzip "$WASMD_ZIP_FILE" "*.proto" -d "$COSMWASM_DIR" -mv "$WASMD_DIR-$WASM_SUFFIX" "$WASMD_DIR" -rm "$WASMD_ZIP_FILE"