Skip to content

testing: add merkle path to endpoint struct. #7576

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

Merged
DimitrisJim merged 1 commit into from
Dec 2, 2024
Merged

testing: add merkle path to endpoint struct. #7576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions testing/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"
channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types"
commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types"
commitmenttypesv2 "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types/v2"
host "github.com/cosmos/ibc-go/v9/modules/core/24-host"
"github.com/cosmos/ibc-go/v9/modules/core/exported"
ibctm "github.com/cosmos/ibc-go/v9/modules/light-clients/07-tendermint"
Expand All @@ -37,6 +38,7 @@ type Endpoint struct {
ConnectionConfig *ConnectionConfig
ChannelConfig *ChannelConfig

MerklePathPrefix commitmenttypesv2.MerklePath
// disableUniqueChannelIDs is used to enforce, in a test,
// the old way to generate channel IDs (all channels are called channel-0)
// It is used only by one test suite and should not be used for new tests.
Expand All @@ -54,6 +56,7 @@ func NewEndpoint(
ClientConfig: clientConfig,
ConnectionConfig: connectionConfig,
ChannelConfig: channelConfig,
MerklePathPrefix: MerklePath,
}
}

Expand All @@ -65,6 +68,7 @@ func NewDefaultEndpoint(chain *TestChain) *Endpoint {
ClientConfig: NewTendermintConfig(),
ConnectionConfig: NewConnectionConfig(),
ChannelConfig: NewChannelConfig(),
MerklePathPrefix: MerklePath,
}
}

Expand Down
2 changes: 1 addition & 1 deletion testing/endpoint_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
// CreateChannel will construct and execute a new MsgCreateChannel on the associated endpoint.
func (endpoint *Endpoint) CreateChannel() (err error) {
endpoint.IncrementNextChannelSequence()
msg := channeltypesv2.NewMsgCreateChannel(endpoint.ClientID, MerklePath, endpoint.Chain.SenderAccount.GetAddress().String())
msg := channeltypesv2.NewMsgCreateChannel(endpoint.ClientID, endpoint.MerklePathPrefix, endpoint.Chain.SenderAccount.GetAddress().String())

// create channel
res, err := endpoint.Chain.SendMsgs(msg)
Expand Down