Merge branch 'main' into kocubinski/fix-nil-iter

cosmos · Aug 17, 2022 · 2e3f287 · 2e3f287
2 parents 8883809 + b515372
commit 2e3f287
Show file tree

Hide file tree

Showing 14 changed files with 1,094 additions and 504 deletions.
diff --git a/scripts/mockgen.sh b/scripts/mockgen.sh
@@ -20,3 +20,4 @@ $mockgen_cmd -source=x/auth/ante/expected_keepers.go -package testutil -destinat
 $mockgen_cmd -source=x/authz/expected_keepers.go -package testutil -destination x/authz/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/bank/types/expected_keepers.go -package testutil -destination x/bank/testutil/expected_keepers_mocks.go
 $mockgen_cmd -source=x/evidence/types/expected_keepers.go -package testutil -destination x/evidence/testutil/expected_keepers_mocks.go
+$mockgen_cmd -source=x/slashing/types/expected_keepers.go -package testutil -destination x/slashing/testutil/expected_keepers_mocks.go
diff --git a/tests/e2e/slashing/client/testutil/cli_test.go b/tests/e2e/slashing/client/testutil/cli_test.go
@@ -8,13 +8,12 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
-	clienttestutil "github.com/cosmos/cosmos-sdk/x/slashing/client/testutil"
 
 	"github.com/stretchr/testify/suite"
 )
 
-func TestIntegrationTestSuite(t *testing.T) {
+func TestEndToEndTestSuite(t *testing.T) {
 	cfg := network.DefaultConfig(simapp.NewTestNetworkFixture)
 	cfg.NumValidators = 1
-	suite.Run(t, clienttestutil.NewIntegrationTestSuite(cfg))
+	suite.Run(t, NewEndToEndTestSuite(cfg))
 }
diff --git a/x/slashing/client/testutil/grpc.go → tests/e2e/slashing/client/testutil/grpc.go b/x/slashing/client/testutil/grpc.go → tests/e2e/slashing/client/testutil/grpc.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing/types"
 )
 
-func (s *IntegrationTestSuite) TestGRPCQueries() {
+func (s *EndToEndTestSuite) TestGRPCQueries() {
 	val := s.network.Validators[0]
 	baseURL := val.APIAddress
 

diff --git a/x/slashing/client/testutil/suite.go → tests/e2e/slashing/client/testutil/suite.go b/x/slashing/client/testutil/suite.go → tests/e2e/slashing/client/testutil/suite.go
@@ -15,20 +15,20 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing/client/cli"
 )
 
-type IntegrationTestSuite struct {
+type EndToEndTestSuite struct {
 	suite.Suite
 
 	cfg     network.Config
 	network *network.Network
 }
 
-func NewIntegrationTestSuite(cfg network.Config) *IntegrationTestSuite {
-	return &IntegrationTestSuite{cfg: cfg}
+func NewEndToEndTestSuite(cfg network.Config) *EndToEndTestSuite {
+	return &EndToEndTestSuite{cfg: cfg}
 }
 
 // SetupSuite executes bootstrapping logic before all the tests, i.e. once before
 // the entire suite, start executing.
-func (s *IntegrationTestSuite) SetupSuite() {
+func (s *EndToEndTestSuite) SetupSuite() {
 	s.T().Log("setting up integration test suite")
 
 	var err error
@@ -41,12 +41,12 @@ func (s *IntegrationTestSuite) SetupSuite() {
 
 // TearDownSuite performs cleanup logic after all the tests, i.e. once after the
 // entire suite, has finished executing.
-func (s *IntegrationTestSuite) TearDownSuite() {
+func (s *EndToEndTestSuite) TearDownSuite() {
 	s.T().Log("tearing down integration test suite")
 	s.network.Cleanup()
 }
 
-func (s *IntegrationTestSuite) TestGetCmdQuerySigningInfo() {
+func (s *EndToEndTestSuite) TestGetCmdQuerySigningInfo() {
 	val := s.network.Validators[0]
 	pubKeyBz, err := s.cfg.Codec.MarshalInterfaceJSON(val.PubKey)
 	s.Require().NoError(err)
@@ -104,7 +104,7 @@ tombstoned: false`, sdk.ConsAddress(val.PubKey.Address())),
 	}
 }
 
-func (s *IntegrationTestSuite) TestGetCmdQueryParams() {
+func (s *EndToEndTestSuite) TestGetCmdQueryParams() {
 	val := s.network.Validators[0]
 
 	testCases := []struct {
@@ -142,7 +142,7 @@ slash_fraction_downtime: "0.010000000000000000"`,
 	}
 }
 
-func (s *IntegrationTestSuite) TestNewUnjailTxCmd() {
+func (s *EndToEndTestSuite) TestNewUnjailTxCmd() {
 	val := s.network.Validators[0]
 	testCases := []struct {
 		name         string