Add CLI tests for simd, distribution

.github/workflows/test.yml

@@ -49,10 +49,14 @@ jobs:
           file: ./coverage.txt # optional
           fail_ci_if_error: true
         if: "env.GIT_DIFF != ''"
-  cli-test:
+  integration-tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: build-sim
+        run: |
+          make build-sim
+        if: "env.GIT_DIFF != ''"
       - name: cli-test
         run: |
-          make cli-test
+          make test-integration

Makefile

@@ -13,7 +13,6 @@ HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
 DOCKER_BUF := docker run -v $(shell pwd):/workspace --workdir /workspace bufbuild/buf
 
 export GO111MODULE = on
-export BUILDDIR
 
 # The below include contains the tools and runsim targets.
 include contrib/devtools/Makefile
@@ -28,13 +27,9 @@ build: go.sum
 	@go build -mod=readonly ./...
 
 build-sim: go.sum
-ifeq ($(OS),Windows_NT)
-	go build -mod=readonly $(BUILD_FLAGS) -o build/simd.exe ./simapp/cmd/simd
-	go build -mod=readonly $(BUILD_FLAGS) -o build/simcli.exe ./simapp/cmd/simcli
-else
-	go build -mod=readonly $(BUILD_FLAGS) -o build/simd ./simapp/cmd/simd
-	go build -mod=readonly $(BUILD_FLAGS) -o build/simcli ./simapp/cmd/simcli
-endif
+	mkdir -p $(BUILDDIR)
+	go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR) ./simapp/cmd/simd
+	go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR) ./simapp/cmd/simcli
 
 .PHONY: \
  build \
@@ -128,6 +123,10 @@ test-unit:
 test-race:
 	@VERSION=$(VERSION) go test -mod=readonly -race $(PACKAGES_NOSIMULATION)
 
+test-integration: build-sim
+	BUILDDIR=$(BUILDDIR) go test -mod=readonly -p 4 `go list ./tests/cli/...` -tags=-tags='ledger test_ledger_mock cli_test'
+	BUILDDIR=$(BUILDDIR) go test -mod=readonly -p 4 `go list ./x/.../client/cli_test/...` -tags=-tags='ledger test_ledger_mock cli_test'
+
 .PHONY: test test-all test-ledger-mock test-ledger test-unit test-race
 
 test-sim-nondeterminism:
@@ -168,10 +167,6 @@ test-sim-benchmark-invariants:
 	-Enabled=true -NumBlocks=1000 -BlockSize=200 \
 	-Period=1 -Commit=true -Seed=57 -v -timeout 24h
 
-cli-test: build-sim
-	@go test -mod=readonly -p 4 `go list ./tests/cli/tests/...` -tags=cli_test -v
-	@go test -mod=readonly -p 4 `go list ./x/.../client/cli_test/...` -tags=cli_test -v
-
 .PHONY: \
 test-sim-nondeterminism \
 test-sim-custom-genesis-fast \
@@ -181,7 +176,7 @@ test-sim-custom-genesis-multi-seed \
 test-sim-multi-seed-short \
 test-sim-multi-seed-long \
 test-sim-benchmark-invariants \
-cli-test
+test-integration
 
 SIM_NUM_BLOCKS ?= 500
 SIM_BLOCK_SIZE ?= 200

tests/cli/helpers/constants.go → tests/cli/constants.go

@@ -1,4 +1,4 @@
-package helpers
+package cli
 
 const (
 	Denom        = "stake"

tests/cli/tests/doc.go → tests/cli/doc.go

@@ -1,3 +1,3 @@
-package tests
+package cli
 
 // package tests runs integration tests which make use of CLI commands.

tests/cli/helpers/executors.go → tests/cli/executors.go

@@ -1,4 +1,4 @@
-package helpers
+package cli
 
 import (
 	"fmt"

tests/cli/helpers/fixtures.go → tests/cli/fixtures.go

@@ -1,4 +1,4 @@
-package helpers
+package cli
 
 import (
 	"io/ioutil"
@@ -16,7 +16,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp"
 )
 
-var cdc = std.MakeCodec(simapp.ModuleBasics)
+var (
+	cdc = std.MakeCodec(simapp.ModuleBasics)
+)
 
 // Fixtures is used to setup the testing environment
 type Fixtures struct {
@@ -46,7 +48,9 @@ func NewFixtures(t *testing.T) *Fixtures {
 	require.NoError(t, err)
 
 	buildDir := os.Getenv("BUILDDIR")
-	require.NotNil(t, buildDir)
+	if buildDir == "" {
+		t.Skip("builddir is empty, skipping")
+	}
 
 	return &Fixtures{
 		T:            t,

tests/cli/helpers/helpers.go → tests/cli/helpers.go

@@ -1,4 +1,4 @@
-package helpers
+package cli
 
 import (
 	"encoding/json"
@@ -19,21 +19,21 @@ import (
 )
 
 var (
-	totalCoins = sdk.NewCoins(
+	TotalCoins = sdk.NewCoins(
 		sdk.NewCoin(Fee2Denom, sdk.TokensFromConsensusPower(2000000)),
 		sdk.NewCoin(FeeDenom, sdk.TokensFromConsensusPower(2000000)),
 		sdk.NewCoin(FooDenom, sdk.TokensFromConsensusPower(2000)),
 		sdk.NewCoin(Denom, sdk.TokensFromConsensusPower(300).Add(sdk.NewInt(12))), // add coins from inflation
 	)
 
-	startCoins = sdk.NewCoins(
+	StartCoins = sdk.NewCoins(
 		sdk.NewCoin(Fee2Denom, sdk.TokensFromConsensusPower(1000000)),
 		sdk.NewCoin(FeeDenom, sdk.TokensFromConsensusPower(1000000)),
 		sdk.NewCoin(FooDenom, sdk.TokensFromConsensusPower(1000)),
 		sdk.NewCoin(Denom, sdk.TokensFromConsensusPower(150)),
 	)
 
-	vestingCoins = sdk.NewCoins(
+	VestingCoins = sdk.NewCoins(
 		sdk.NewCoin(FeeDenom, sdk.TokensFromConsensusPower(500000)),
 	)
 )

tests/cli/helpers/init.go → tests/cli/init.go

@@ -1,4 +1,4 @@
-package helpers
+package cli
 
 import (
 	"fmt"
@@ -42,10 +42,10 @@ func InitFixtures(t *testing.T) (f *Fixtures) {
 	f.CLIConfig("trust-node", "true")
 
 	// start an account with tokens
-	f.AddGenesisAccount(f.KeyAddress(KeyFoo), startCoins)
+	f.AddGenesisAccount(f.KeyAddress(KeyFoo), StartCoins)
 	f.AddGenesisAccount(
-		f.KeyAddress(KeyVesting), startCoins,
-		fmt.Sprintf("--vesting-amount=%s", vestingCoins),
+		f.KeyAddress(KeyVesting), StartCoins,
+		fmt.Sprintf("--vesting-amount=%s", VestingCoins),
 		fmt.Sprintf("--vesting-start-time=%d", time.Now().UTC().UnixNano()),
 		fmt.Sprintf("--vesting-end-time=%d", time.Now().Add(60*time.Second).UTC().UnixNano()),
 	)

tests/cli/tests/keys_test.go → tests/cli/keys_test.go

@@ -1,36 +1,35 @@
 // +build cli_test
 
-package tests
+package cli_test
 
 import (
 	"fmt"
 	"testing"
 
+	"github.com/cosmos/cosmos-sdk/tests/cli"
 	"github.com/stretchr/testify/require"
-
-	"github.com/cosmos/cosmos-sdk/tests/cli/helpers"
 )
 
 func TestCLIKeysAddMultisig(t *testing.T) {
 	t.Parallel()
-	f := helpers.InitFixtures(t)
+	f := cli.InitFixtures(t)
 
 	// key names order does not matter
 	f.KeysAdd("msig1", "--multisig-threshold=2",
-		fmt.Sprintf("--multisig=%s,%s", helpers.KeyBar, helpers.KeyBaz))
+		fmt.Sprintf("--multisig=%s,%s", cli.KeyBar, cli.KeyBaz))
 	ke1Address1 := f.KeysShow("msig1").Address
 	f.KeysDelete("msig1")
 
 	f.KeysAdd("msig2", "--multisig-threshold=2",
-		fmt.Sprintf("--multisig=%s,%s", helpers.KeyBaz, helpers.KeyBar))
+		fmt.Sprintf("--multisig=%s,%s", cli.KeyBaz, cli.KeyBar))
 	require.Equal(t, ke1Address1, f.KeysShow("msig2").Address)
 	f.KeysDelete("msig2")
 
 	f.KeysAdd("msig3", "--multisig-threshold=2",
-		fmt.Sprintf("--multisig=%s,%s", helpers.KeyBar, helpers.KeyBaz),
+		fmt.Sprintf("--multisig=%s,%s", cli.KeyBar, cli.KeyBaz),
 		"--nosort")
 	f.KeysAdd("msig4", "--multisig-threshold=2",
-		fmt.Sprintf("--multisig=%s,%s", helpers.KeyBaz, helpers.KeyBar),
+		fmt.Sprintf("--multisig=%s,%s", cli.KeyBaz, cli.KeyBar),
 		"--nosort")
 	require.NotEqual(t, f.KeysShow("msig3").Address, f.KeysShow("msig4").Address)
 
@@ -40,7 +39,7 @@ func TestCLIKeysAddMultisig(t *testing.T) {
 
 func TestCLIKeysAddRecover(t *testing.T) {
 	t.Parallel()
-	f := helpers.InitFixtures(t)
+	f := cli.InitFixtures(t)
 
 	exitSuccess, _, _ := f.KeysAddRecover("empty-mnemonic", "")
 	require.False(t, exitSuccess)
@@ -55,7 +54,7 @@ func TestCLIKeysAddRecover(t *testing.T) {
 
 func TestCLIKeysAddRecoverHDPath(t *testing.T) {
 	t.Parallel()
-	f := helpers.InitFixtures(t)
+	f := cli.InitFixtures(t)
 
 	f.KeysAddRecoverHDPath("test-recoverHD1", "dentist task convince chimney quality leave banana trade firm crawl eternal easily", 0, 0)
 	require.Equal(t, "cosmos1qcfdf69js922qrdr4yaww3ax7gjml6pdds46f4", f.KeyAddress("test-recoverHD1").String())

tests/cli/simd_test.go

@@ -0,0 +1,128 @@
+package cli_test
+
+import (
+	"fmt"
+	"github.com/cosmos/cosmos-sdk/std"
+	"github.com/cosmos/cosmos-sdk/tests/cli"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/x/auth"
+	"github.com/cosmos/cosmos-sdk/x/bank"
+	"github.com/stretchr/testify/require"
+	tmtypes "github.com/tendermint/tendermint/types"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+)
+
+func TestSimdCollectGentxs(t *testing.T) {
+	t.Parallel()
+	var customMaxBytes, customMaxGas int64 = 99999999, 1234567
+	f := cli.NewFixtures(t)
+
+	// Initialise temporary directories
+	gentxDir, err := ioutil.TempDir("", "")
+	gentxDoc := filepath.Join(gentxDir, "gentx.json")
+	require.NoError(t, err)
+
+	// Reset testing path
+	f.UnsafeResetAll()
+
+	// Initialize keys
+	f.KeysAdd(cli.KeyFoo)
+
+	// Configure json output
+	f.CLIConfig("output", "json")
+
+	// Run init
+	f.SDInit(cli.KeyFoo)
+
+	// Customise genesis.json
+
+	genFile := f.GenesisFile()
+	genDoc, err := tmtypes.GenesisDocFromFile(genFile)
+	require.NoError(t, err)
+	genDoc.ConsensusParams.Block.MaxBytes = customMaxBytes
+	genDoc.ConsensusParams.Block.MaxGas = customMaxGas
+	genDoc.SaveAs(genFile)
+
+	// Add account to genesis.json
+	f.AddGenesisAccount(f.KeyAddress(cli.KeyFoo), cli.StartCoins)
+
+	// Write gentx file
+	f.GenTx(cli.KeyFoo, fmt.Sprintf("--output-document=%s", gentxDoc))
+
+	// Collect gentxs from a custom directory
+	f.CollectGenTxs(fmt.Sprintf("--gentx-dir=%s", gentxDir))
+
+	genDoc, err = tmtypes.GenesisDocFromFile(genFile)
+	require.NoError(t, err)
+	require.Equal(t, genDoc.ConsensusParams.Block.MaxBytes, customMaxBytes)
+	require.Equal(t, genDoc.ConsensusParams.Block.MaxGas, customMaxGas)
+
+	f.Cleanup(gentxDir)
+}
+
+func TestSimdAddGenesisAccount(t *testing.T) {
+	t.Parallel()
+	f := cli.NewFixtures(t)
+
+	// Reset testing path
+	f.UnsafeResetAll()
+
+	// Initialize keys
+	f.KeysDelete(cli.KeyFoo)
+	f.KeysDelete(cli.KeyBar)
+	f.KeysDelete(cli.KeyBaz)
+	f.KeysAdd(cli.KeyFoo)
+	f.KeysAdd(cli.KeyBar)
+	f.KeysAdd(cli.KeyBaz)
+
+	// Configure json output
+	f.CLIConfig("output", "json")
+
+	// Run init
+	f.SDInit(cli.KeyFoo)
+
+	// Add account to genesis.json
+	bazCoins := sdk.Coins{
+		sdk.NewInt64Coin("acoin", 1000000),
+		sdk.NewInt64Coin("bcoin", 1000000),
+	}
+
+	f.AddGenesisAccount(f.KeyAddress(cli.KeyFoo), cli.StartCoins)
+	f.AddGenesisAccount(f.KeyAddress(cli.KeyBar), bazCoins)
+
+	genesisState := f.GenesisState()
+
+	appCodec := std.NewAppCodec(f.Cdc)
+
+	accounts := auth.GetGenesisStateFromAppState(appCodec, genesisState).Accounts
+	balances := bank.GetGenesisStateFromAppState(f.Cdc, genesisState).Balances
+	balancesSet := make(map[string]sdk.Coins)
+
+	for _, b := range balances {
+		balancesSet[b.GetAddress().String()] = b.Coins
+	}
+
+	require.Equal(t, accounts[0].GetAddress(), f.KeyAddress(cli.KeyFoo))
+	require.Equal(t, accounts[1].GetAddress(), f.KeyAddress(cli.KeyBar))
+	require.True(t, balancesSet[accounts[0].GetAddress().String()].IsEqual(cli.StartCoins))
+	require.True(t, balancesSet[accounts[1].GetAddress().String()].IsEqual(bazCoins))
+
+	// Cleanup testing directories
+	f.Cleanup()
+}
+
+func TestValidateGenesis(t *testing.T) {
+	t.Parallel()
+	f := cli.InitFixtures(t)
+
+	// start simd server
+	proc := f.SDStart()
+	defer proc.Stop(false)
+
+	f.ValidateGenesis()
+
+	// Cleanup testing directories
+	f.Cleanup()
+}