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

CLI/Tests: Remove Fixtures #6799

Merged
merged 14 commits into from
Jul 21, 2020
21 changes: 0 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,24 +188,3 @@ jobs:
with:
file: ./coverage.txt
if: "env.GIT_DIFF != ''"

integration-tests:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v1
id: git_diff
with:
SUFFIX_FILTER: |
.go
.mod
.sum
- name: build-simd
run: |
make build-simd
if: "env.GIT_DIFF != ''"
- name: cli-test
run: |
make test-integration
if: "env.GIT_DIFF != ''"
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@ test-unit:
test-race:
@VERSION=$(VERSION) go test -mod=readonly -race $(PACKAGES_NOSIMULATION)

test-integration: build-simd
BUILDDIR=$(BUILDDIR) go test -mod=readonly -p 4 -tags='ledger test_ledger_mock cli_test' -run ^TestCLI `go list ./.../cli/...`

.PHONY: test test-all test-ledger-mock test-ledger test-unit test-race

test-sim-nondeterminism:
Expand Down Expand Up @@ -239,8 +236,7 @@ test-sim-after-import \
test-sim-custom-genesis-multi-seed \
test-sim-multi-seed-short \
test-sim-multi-seed-long \
test-sim-benchmark-invariants \
test-integration
test-sim-benchmark-invariants

SIM_NUM_BLOCKS ?= 500
SIM_BLOCK_SIZE ?= 200
Expand Down
9 changes: 0 additions & 9 deletions client/tx/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,6 @@ func GenerateOrBroadcastTxCLI(clientCtx client.Context, flagSet *pflag.FlagSet,
return GenerateOrBroadcastTxWithFactory(clientCtx, txf, msgs...)
}

// GenerateOrBroadcastTx will either generate and print and unsigned transaction
// or sign it and broadcast it returning an error upon failure.
//
// TODO: Remove in favor of GenerateOrBroadcastTxCLI
func GenerateOrBroadcastTx(clientCtx client.Context, msgs ...sdk.Msg) error {
txf := NewFactoryFromDeprecated(clientCtx.Input).WithTxConfig(clientCtx.TxConfig).WithAccountRetriever(clientCtx.AccountRetriever)
alexanderbez marked this conversation as resolved.
Show resolved Hide resolved
return GenerateOrBroadcastTxWithFactory(clientCtx, txf, msgs...)
}

// GenerateOrBroadcastTxWithFactory will either generate and print and unsigned transaction
// or sign it and broadcast it returning an error upon failure.
func GenerateOrBroadcastTxWithFactory(clientCtx client.Context, txf Factory, msgs ...sdk.Msg) error {
Expand Down
2 changes: 1 addition & 1 deletion contrib/test_cover.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e

PKGS=$(go list ./... | grep -v '/simapp' | grep -v '/cli_test')
PKGS=$(go list ./... | grep -v '/simapp')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this script is used at all. It is mentioned in a Makefile's target but it does not seem to be used anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's used by test-cover, but that isn't used by anything. Let's remove it in a subsequent PR.


set -e
echo "mode: atomic" > coverage.txt
Expand Down
13 changes: 0 additions & 13 deletions tests/cli/constants.go

This file was deleted.

3 changes: 0 additions & 3 deletions tests/cli/doc.go

This file was deleted.

49 changes: 0 additions & 49 deletions tests/cli/executors.go

This file was deleted.

81 changes: 0 additions & 81 deletions tests/cli/fixtures.go

This file was deleted.

24 changes: 0 additions & 24 deletions tests/cli/grpc_query_test.go

This file was deleted.

Loading