From b2920ad0bb6fa3fe600d696210e914c7d18819d5 Mon Sep 17 00:00:00 2001 From: zale144 Date: Thu, 11 Jul 2024 16:09:10 +0200 Subject: [PATCH] Fix tests and linter issues --- app/apptesting/test_suite.go | 4 ++- app/upgrades/v5/types/block_descriptor.pb.go | 1 + app/upgrades/v5/types/params.pb.go | 1 + app/upgrades/v5/types/rollapp.pb.go | 1 + app/upgrades/v5/types/state_info.pb.go | 1 + .../keeper/msg_server_create_rollapp_test.go | 27 ++++++++++++------- .../keeper/msg_server_update_state_test.go | 20 +++++++------- x/rollapp/keeper/rollapp_suite_test.go | 2 -- 8 files changed, 34 insertions(+), 23 deletions(-) diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index ca07861e6..ebd35c9fa 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -1,6 +1,8 @@ package apptesting import ( + "strings" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" @@ -36,7 +38,7 @@ func (s *KeeperTestHelper) CreateRollappWithName(name string) string { Creator: alice, RollappId: name, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: "eth", + Bech32Prefix: strings.ToLower(rand.Str(3)), GenesisInfo: rollapptypes.GenesisInfo{ GenesisUrls: []string{"http://localhost:8080/genesis.json"}, GenesisChecksum: "1234567890abcdefg", diff --git a/app/upgrades/v5/types/block_descriptor.pb.go b/app/upgrades/v5/types/block_descriptor.pb.go index 3e855effc..468d1c69b 100644 --- a/app/upgrades/v5/types/block_descriptor.pb.go +++ b/app/upgrades/v5/types/block_descriptor.pb.go @@ -1,4 +1,5 @@ // COPIED FROM main +// Code generated by protoc-gen-gogo. DO NOT EDIT. package types diff --git a/app/upgrades/v5/types/params.pb.go b/app/upgrades/v5/types/params.pb.go index bd4be0c97..898d3260d 100644 --- a/app/upgrades/v5/types/params.pb.go +++ b/app/upgrades/v5/types/params.pb.go @@ -1,4 +1,5 @@ // COPIED FROM main +// Code generated by protoc-gen-gogo. DO NOT EDIT. package types diff --git a/app/upgrades/v5/types/rollapp.pb.go b/app/upgrades/v5/types/rollapp.pb.go index 7a27c76d5..b098c2b76 100644 --- a/app/upgrades/v5/types/rollapp.pb.go +++ b/app/upgrades/v5/types/rollapp.pb.go @@ -1,4 +1,5 @@ // COPIED FROM main +// Code generated by protoc-gen-gogo. DO NOT EDIT. package types diff --git a/app/upgrades/v5/types/state_info.pb.go b/app/upgrades/v5/types/state_info.pb.go index 83dd4a704..0694c3d61 100644 --- a/app/upgrades/v5/types/state_info.pb.go +++ b/app/upgrades/v5/types/state_info.pb.go @@ -1,4 +1,5 @@ // COPIED FROM main +// Code generated by protoc-gen-gogo. DO NOT EDIT. package types diff --git a/x/rollapp/keeper/msg_server_create_rollapp_test.go b/x/rollapp/keeper/msg_server_create_rollapp_test.go index 5978807ba..5b3a681ec 100644 --- a/x/rollapp/keeper/msg_server_create_rollapp_test.go +++ b/x/rollapp/keeper/msg_server_create_rollapp_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + "strings" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/libs/rand" @@ -29,7 +30,7 @@ func (suite *RollappTestSuite) TestCreateRollappAlreadyExists() { Creator: alice, RollappId: "rollapp1", InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err := suite.msgServer.CreateRollapp(goCtx, &rollapp) @@ -49,7 +50,7 @@ func (suite *RollappTestSuite) TestCreateRollappSequencerExists() { Creator: alice, RollappId: "rollapp1", InitialSequencerAddress: seqAddr, - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err := suite.msgServer.CreateRollapp(goCtx, &rollapp) @@ -59,7 +60,7 @@ func (suite *RollappTestSuite) TestCreateRollappSequencerExists() { Creator: alice, RollappId: "rollapp2", InitialSequencerAddress: seqAddr, - Bech32Prefix: bech32Prefix2, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err = suite.msgServer.CreateRollapp(goCtx, &rollapp) @@ -71,6 +72,8 @@ func (suite *RollappTestSuite) TestCreateRollappBech32PrefixExists() { goCtx := sdk.WrapSDKContext(suite.Ctx) + bech32Prefix := "rax" + rollapp := types.MsgCreateRollapp{ Creator: alice, RollappId: "rollapp1", @@ -145,7 +148,7 @@ func (suite *RollappTestSuite) TestCreateRollappId() { Creator: alice, RollappId: test.rollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } @@ -207,7 +210,7 @@ func (suite *RollappTestSuite) TestCreateRollappIdRevisionNumber() { Creator: alice, RollappId: test.rollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } @@ -266,7 +269,7 @@ func (suite *RollappTestSuite) TestForkChainId() { Creator: alice, RollappId: test.rollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } @@ -281,7 +284,7 @@ func (suite *RollappTestSuite) TestForkChainId() { Creator: alice, RollappId: test.newRollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix2, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err = suite.msgServer.CreateRollapp(goCtx, &rollappMsg2) @@ -321,7 +324,7 @@ func (suite *RollappTestSuite) TestOverwriteEIP155Key() { Creator: alice, RollappId: test.rollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err := suite.msgServer.CreateRollapp(goCtx, &rollapp) @@ -342,7 +345,7 @@ func (suite *RollappTestSuite) TestOverwriteEIP155Key() { Creator: alice, RollappId: test.badRollappId, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix2, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } _, err = suite.msgServer.CreateRollapp(goCtx, &badrollapp) @@ -391,7 +394,7 @@ func (suite *RollappTestSuite) createRollappWithCreatorAndVerify(expectedErr err Creator: creator, RollappId: fmt.Sprintf("%s%d", "rollapp", rand.Int63()), //nolint:gosec // this is for a test InitialSequencerAddress: address, - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } // rollappExpect is the expected result of creating rollapp @@ -424,3 +427,7 @@ func (suite *RollappTestSuite) createRollappWithCreatorAndVerify(expectedErr err } return rollappSummaryExpect } + +func uniqueBech32Prefix() string { + return strings.ToLower(rand.Str(3)) +} diff --git a/x/rollapp/keeper/msg_server_update_state_test.go b/x/rollapp/keeper/msg_server_update_state_test.go index 5346157da..df2777594 100644 --- a/x/rollapp/keeper/msg_server_update_state_test.go +++ b/x/rollapp/keeper/msg_server_update_state_test.go @@ -23,7 +23,7 @@ func (suite *RollappTestSuite) TestFirstUpdateState() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -74,7 +74,7 @@ func (suite *RollappTestSuite) TestUpdateState() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -207,7 +207,7 @@ func (suite *RollappTestSuite) TestUpdateStateVersionMismatch() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -238,7 +238,7 @@ func (suite *RollappTestSuite) TestUpdateStateUnknownSequencer() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -268,7 +268,7 @@ func (suite *RollappTestSuite) TestUpdateStateSequencerRollappMismatch() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -307,7 +307,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrLogicUnpermissioned() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -346,7 +346,7 @@ func (suite *RollappTestSuite) TestFirstUpdateStateGensisHightGreaterThanZero() Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -385,7 +385,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrWrongBlockHeight() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -447,7 +447,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrLogicMissingStateInfo() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) @@ -494,7 +494,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrNotActiveSequencer() { Creator: alice, Version: 3, InitialSequencerAddress: sample.AccAddress(), - Bech32Prefix: bech32Prefix, + Bech32Prefix: uniqueBech32Prefix(), GenesisInfo: genesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) diff --git a/x/rollapp/keeper/rollapp_suite_test.go b/x/rollapp/keeper/rollapp_suite_test.go index 9258a9302..053ab6939 100644 --- a/x/rollapp/keeper/rollapp_suite_test.go +++ b/x/rollapp/keeper/rollapp_suite_test.go @@ -24,8 +24,6 @@ const ( alice = "dym1wg8p6j0pxpnsvhkwfu54ql62cnrumf0v634mft" bob = "dym1d0wlmz987qlurs6e3kc6zd25z6wsdmnwx8tafy" registrationFee = "1000000000000000000adym" - bech32Prefix = "eth" - bech32Prefix2 = "rax" ) type RollappTestSuite struct {