Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add default solomachine client id for testing #3316

Merged
merged 11 commits into from
Apr 11, 2023
+16 −17
Merged

chore: add default solomachine client id for testing #3316

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a62102
add default solomachine client id for testing
PanGan21 Mar 21, 2023
80e81f5
Merge branch 'main' into 2843-solomachine-testing-contant
Mar 22, 2023
47dab23
lint files
PanGan21 Mar 22, 2023
403d8b7
Merge branch 'main' into 2843-solomachine-testing-contant
PanGan21 Mar 22, 2023
66cc6d2
Merge branch 'main' into 2843-solomachine-testing-contant
PanGan21 Mar 23, 2023
3d55daa
Merge branch 'main' into 2843-solomachine-testing-contant
PanGan21 Mar 23, 2023
7763da8
Merge branch 'main' into 2843-solomachine-testing-contant
DimitrisJim Mar 24, 2023
42a81bf
Merge branch 'main' into 2843-solomachine-testing-contant
PanGan21 Mar 24, 2023
73158b6
Merge branch 'main' into 2843-solomachine-testing-contant
PanGan21 Mar 27, 2023
7df43ce
Merge branch 'main' into 2843-solomachine-testing-contant
damiannolan Mar 29, 2023
4013dbc
Merge branch 'main' into 2843-solomachine-testing-contant
Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/core/02-client/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func (suite KeeperTestSuite) TestIterateClientStates() { //nolint:govet // this
}

solomachines := []*ibctesting.Solomachine{
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4),
}

Expand Down
2 changes: 1 addition & 1 deletion modules/core/02-client/migrations/v7/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateGenesisSolomachine() {
}

// create multiple legacy solo machine clients
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1)
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1)
solomachineMulti := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4)

clientGenState := ibcclient.ExportGenesis(suite.chainA.GetContext(), suite.chainA.App.GetIBCKeeper().ClientKeeper)
Expand Down
4 changes: 2 additions & 2 deletions modules/core/02-client/migrations/v7/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateStore() {
}

solomachines := []*ibctesting.Solomachine{
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4),
}

Expand All @@ -69,7 +69,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateStore() {

func (suite *MigrationsV7TestSuite) TestMigrateStoreNoTendermintClients() {
solomachines := []*ibctesting.Solomachine{
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1),
ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4),
}

Expand Down
11 changes: 5 additions & 6 deletions modules/core/02-client/types/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ import (
)

const (
tmClientID0 = "07-tendermint-0"
tmClientID1 = "07-tendermint-1"
invalidClientID = "myclient-0"
soloMachineClientID = "06-solomachine-0"
clientID = tmClientID0
tmClientID0 = "07-tendermint-0"
tmClientID1 = "07-tendermint-1"
invalidClientID = "myclient-0"
clientID = tmClientID0

height = 10
)
Expand Down Expand Up @@ -112,7 +111,7 @@ func (suite *TypesTestSuite) TestValidateGenesis() {
genState: types.NewGenesisState(
[]types.IdentifiedClientState{
types.NewIdentifiedClientState(
soloMachineClientID, ibctm.NewClientState(suite.chainA.ChainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath),
ibctesting.DefaultSolomachineClientID, ibctm.NewClientState(suite.chainA.ChainID, ibctm.DefaultTrustLevel, ibctesting.TrustingPeriod, ibctesting.UnbondingPeriod, ibctesting.MaxClockDrift, clientHeight, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath),
),
types.NewIdentifiedClientState(tmClientID0, solomachine.NewClientState(0, &solomachine.ConsensusState{PublicKey: suite.solomachine.ConsensusState().PublicKey, Diversifier: suite.solomachine.Diversifier, Timestamp: suite.solomachine.Time})),
},
Expand Down
2 changes: 1 addition & 1 deletion modules/core/migrations/v7/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (suite *MigrationsV7TestSuite) TestMigrateGenesisSolomachine() {
}

// create multiple legacy solo machine clients
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1)
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1)
solomachineMulti := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-1", "testing", 4)

clientGenState := ibcclient.ExportGenesis(suite.chainA.GetContext(), suite.chainA.App.GetIBCKeeper().ClientKeeper)
Expand Down
7 changes: 2 additions & 5 deletions modules/light-clients/06-solomachine/solomachine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ import (
"github.com/cosmos/ibc-go/v7/testing/mock"
)

var (
channelIDSolomachine = "channel-on-solomachine" // channelID generated on solo machine side
clientIDSolomachine = "06-solomachine-0"
)
var channelIDSolomachine = "channel-on-solomachine" // channelID generated on solo machine side

type SoloMachineTestSuite struct {
suite.Suite
Expand Down Expand Up @@ -123,7 +120,7 @@ func (suite *SoloMachineTestSuite) TestTimeout() {
// simulate solomachine time increment
suite.solomachine.Time++

suite.solomachine.UpdateClient(suite.chainA, clientIDSolomachine)
suite.solomachine.UpdateClient(suite.chainA, ibctesting.DefaultSolomachineClientID)

suite.solomachine.TimeoutPacket(suite.chainA, packet)

Expand Down
2 changes: 1 addition & 1 deletion modules/light-clients/07-tendermint/migrations/migrations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (suite *MigrationsTestSuite) TestPruneExpiredConsensusStates() {
paths[i] = path
}

solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "06-solomachine-0", "testing", 1)
solomachine := ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, ibctesting.DefaultSolomachineClientID, "testing", 1)
smClientStore := suite.chainA.App.GetIBCKeeper().ClientKeeper.ClientStore(suite.chainA.GetContext(), solomachine.ClientID)

// set client state
Expand Down
3 changes: 3 additions & 0 deletions testing/solomachine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ var (
channelIDSolomachine = "channel-on-solomachine" // channelID generated on solo machine side
)

// DefaultSolomachineClientID is the default solo machine client id used for testing
var DefaultSolomachineClientID = "06-solomachine-0"

// Solomachine is a testing helper used to simulate a counterparty
// solo machine client.
type Solomachine struct {
Expand Down