Skip to content

Commit

Permalink
Fix tests and linter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@zale144
zale144 committed Jul 11, 2024
1 parent d7b5602 commit b2920ad
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 23 deletions.
4 changes: 3 additions & 1 deletion app/apptesting/test_suite.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions app/upgrades/v5/types/block_descriptor.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/upgrades/v5/types/params.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/upgrades/v5/types/rollapp.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/upgrades/v5/types/state_info.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 17 additions & 10 deletions x/rollapp/keeper/msg_server_create_rollapp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper_test

import (
"fmt"
"strings"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/tendermint/tendermint/libs/rand"
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -71,6 +72,8 @@ func (suite *RollappTestSuite) TestCreateRollappBech32PrefixExists() {

goCtx := sdk.WrapSDKContext(suite.Ctx)

bech32Prefix := "rax"

rollapp := types.MsgCreateRollapp{
Creator: alice,
RollappId: "rollapp1",
Expand Down Expand Up @@ -145,7 +148,7 @@ func (suite *RollappTestSuite) TestCreateRollappId() {
Creator: alice,
RollappId: test.rollappId,
InitialSequencerAddress: sample.AccAddress(),
Bech32Prefix: bech32Prefix,
Bech32Prefix: uniqueBech32Prefix(),
GenesisInfo: genesisInfo,
}

Expand Down Expand Up @@ -207,7 +210,7 @@ func (suite *RollappTestSuite) TestCreateRollappIdRevisionNumber() {
Creator: alice,
RollappId: test.rollappId,
InitialSequencerAddress: sample.AccAddress(),
Bech32Prefix: bech32Prefix,
Bech32Prefix: uniqueBech32Prefix(),
GenesisInfo: genesisInfo,
}

Expand Down Expand Up @@ -266,7 +269,7 @@ func (suite *RollappTestSuite) TestForkChainId() {
Creator: alice,
RollappId: test.rollappId,
InitialSequencerAddress: sample.AccAddress(),
Bech32Prefix: bech32Prefix,
Bech32Prefix: uniqueBech32Prefix(),
GenesisInfo: genesisInfo,
}

Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -424,3 +427,7 @@ func (suite *RollappTestSuite) createRollappWithCreatorAndVerify(expectedErr err
}
return rollappSummaryExpect
}

func uniqueBech32Prefix() string {
return strings.ToLower(rand.Str(3))
}
20 changes: 10 additions & 10 deletions x/rollapp/keeper/msg_server_update_state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions x/rollapp/keeper/rollapp_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ const (
alice = "dym1wg8p6j0pxpnsvhkwfu54ql62cnrumf0v634mft"
bob = "dym1d0wlmz987qlurs6e3kc6zd25z6wsdmnwx8tafy"
registrationFee = "1000000000000000000adym"
bech32Prefix = "eth"
bech32Prefix2 = "rax"
)

type RollappTestSuite struct {
Expand Down

0 comments on commit b2920ad

Please sign in to comment.