diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4c8d90964..e62765ce1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,8 +6,6 @@ on: - "**/*.md" - "docs/**" push: - branches: - - main paths-ignore: - "**/*.md" - "docs/**" @@ -128,4 +126,4 @@ jobs: - name: Test Local Network Liveness run: | ./contrib/scripts/test_localnet_liveness.sh 100 5 50 localhost - if: env.GIT_DIFF + if: env.GIT_DIFF \ No newline at end of file diff --git a/Makefile b/Makefile index af2b6996d..a5f290800 100644 --- a/Makefile +++ b/Makefile @@ -208,10 +208,10 @@ $(TEST_TARGETS): run-tests run-tests: ifneq (,$(shell which tparse 2>/dev/null)) @echo "--> Running tests" - @go test -mod=readonly -json $(ARGS) $(TEST_PACKAGES) | tparse + @go test -v -mod=readonly -json $(ARGS) $(TEST_PACKAGES) | tparse else @echo "--> Running tests" - @go test -mod=readonly $(ARGS) $(TEST_PACKAGES) + @go test -v -mod=readonly $(ARGS) $(TEST_PACKAGES) endif .PHONY: run-tests $(TEST_TARGETS) diff --git a/app/app.go b/app/app.go index 2d7a0cd39..c086f7e85 100644 --- a/app/app.go +++ b/app/app.go @@ -261,6 +261,10 @@ func (app *AtomOneApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) a if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } + // Print each entry in the map as a string + for key, value := range genesisState { + fmt.Printf("%s: %s\n", key, string(value)) + } app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) diff --git a/tests/e2e/e2e_feegrant_test.go b/tests/e2e/e2e_feegrant_test.go index ad04c967d..e95dd51c7 100644 --- a/tests/e2e/e2e_feegrant_test.go +++ b/tests/e2e/e2e_feegrant_test.go @@ -25,9 +25,9 @@ func (s *IntegrationTestSuite) testFeeGrant() { api = fmt.Sprintf("http://%s", s.valResources[c.id][valIdx].GetHostPort("1317/tcp")) ) - alice, _ := c.genesisAccounts[4].keyInfo.GetAddress() - bob, _ := c.genesisAccounts[5].keyInfo.GetAddress() - charlie, _ := c.genesisAccounts[6].keyInfo.GetAddress() + alice, _ := c.genesisAccounts[1].keyInfo.GetAddress() + bob, _ := c.genesisAccounts[2].keyInfo.GetAddress() + charlie, _ := c.genesisAccounts[3].keyInfo.GetAddress() // add fee grant from alice to bob s.execFeeGrant( diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 8da315aba..13a1a1372 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -180,7 +180,7 @@ func (s *IntegrationTestSuite) initNodes(c *chain) { c.genesisAccounts[2]: Test Account 1 c.genesisAccounts[3]: Test Account 2 */ - s.Require().NoError(c.addAccountFromMnemonic(7)) + s.Require().NoError(c.addAccountFromMnemonic(5)) // Initialize a genesis file for the first validator val0ConfigDir := c.validators[0].configDir() var addrAll []sdk.AccAddress @@ -541,6 +541,7 @@ func (s *IntegrationTestSuite) runValidators(c *chain, portOffset int) { } } + fmt.Println(fmt.Sprintf("%s:%s", runOpts.Repository, runOpts.Tag)) resource, err := s.dkrPool.RunWithOptions(runOpts, noRestart) s.Require().NoError(err) @@ -551,6 +552,17 @@ func (s *IntegrationTestSuite) runValidators(c *chain, portOffset int) { rpcClient, err := rpchttp.New("tcp://localhost:26657", "/websocket") s.Require().NoError(err) + defer func() { + err = s.dkrPool.Client.Logs(docker.LogsOptions{ + Container: s.valResources[c.id][0].Container.ID, + OutputStream: os.Stdout, + ErrorStream: os.Stdout, + Stdout: true, + Stderr: true, + // Follow: true, + }) + fmt.Println("ERR LOGS", err) + }() s.Require().Eventually( func() bool { ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)