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

Jump to bottom

tests: adding followup tests for in-flight packets on chanUpgradeConfirm #4491

Merged
merged 8 commits into from
Aug 30, 2023
Merged

tests: adding followup tests for in-flight packets on chanUpgradeConfirm #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba07e69
tests: adding followup tests for in-flight packets on chanUpgradeConfirm
damiannolan Aug 28, 2023
ff1b40d
fix: adapt failing test and format
damiannolan Aug 28, 2023
e496dff
Merge branch '04-channel-upgrades' into damian/4374-address-followup-…
damiannolan Aug 29, 2023
fb0f8bd
Merge branch '04-channel-upgrades' into damian/4374-address-followup-…
damiannolan Aug 29, 2023
bda2909
Merge branch '04-channel-upgrades' into damian/4374-address-followup-…
damiannolan Aug 29, 2023
d843522
fix: resolve compiler breakage of enum naming
damiannolan Aug 29, 2023
0ca6af0
Merge branch '04-channel-upgrades' into damian/4374-address-followup-…
damiannolan Aug 30, 2023
47ee31e
Merge branch '04-channel-upgrades' into damian/4374-address-followup-…
damiannolan Aug 30, 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
38 changes: 38 additions & 0 deletions modules/core/04-channel/keeper/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,44 @@ func (suite *KeeperTestSuite) TestChanUpgradeConfirm() {
},
nil,
},
{
"success with in-flight packets on init chain",
func() {
path = ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.Setup(path)

path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion
path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = mock.UpgradeVersion

err := path.EndpointA.ChanUpgradeInit()
suite.Require().NoError(err)

err = path.EndpointB.ChanUpgradeTry()
suite.Require().NoError(err)

seq, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
suite.Require().Equal(uint64(1), seq)
suite.Require().NoError(err)

err = path.EndpointA.ChanUpgradeAck()
suite.Require().NoError(err)

err = path.EndpointB.UpdateClient()
suite.Require().NoError(err)

counterpartyChannelState = path.EndpointA.GetChannel().State
counterpartyUpgrade = path.EndpointA.GetChannelUpgrade()
},
nil,
},
{
"success with in-flight packets on try chain",
func() {
portID, channelID := path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID
suite.chainB.GetSimApp().GetIBCKeeper().ChannelKeeper.SetPacketCommitment(suite.chainB.GetContext(), portID, channelID, 1, []byte("hash"))
},
nil,
},
{
"channel not found",
func() {
Expand Down
61 changes: 57 additions & 4 deletions modules/core/keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,11 +1074,64 @@ func (suite *KeeperTestSuite) TestChannelUpgradeConfirm() {
},
},
{
"success, pending in-flight packets",
"success, pending in-flight packets on init chain",
func() {
portID := path.EndpointB.ChannelConfig.PortID
channelID := path.EndpointB.ChannelID
// Set a dummy packet commitment to simulate in-flight packets
path = ibctesting.NewPath(suite.chainA, suite.chainB)
suite.coordinator.Setup(path)

path.EndpointA.ChannelConfig.ProposedUpgrade.Fields.Version = ibcmock.UpgradeVersion
path.EndpointB.ChannelConfig.ProposedUpgrade.Fields.Version = ibcmock.UpgradeVersion

err := path.EndpointA.ChanUpgradeInit()
suite.Require().NoError(err)

err = path.EndpointB.ChanUpgradeTry()
suite.Require().NoError(err)

seq, err := path.EndpointA.SendPacket(path.EndpointB.Chain.GetTimeoutHeight(), 0, ibctesting.MockPacketData)
suite.Require().Equal(uint64(1), seq)
suite.Require().NoError(err)

err = path.EndpointA.ChanUpgradeAck()
suite.Require().NoError(err)

err = path.EndpointB.UpdateClient()
suite.Require().NoError(err)

counterpartyChannelState := path.EndpointA.GetChannel().State
counterpartyUpgrade := path.EndpointA.GetChannelUpgrade()

proofChannel, proofUpgrade, proofHeight := path.EndpointB.QueryChannelUpgradeProof()

msg = &channeltypes.MsgChannelUpgradeConfirm{
PortId: path.EndpointB.ChannelConfig.PortID,
ChannelId: path.EndpointB.ChannelID,
CounterpartyChannelState: counterpartyChannelState,
CounterpartyUpgrade: counterpartyUpgrade,
ProofChannel: proofChannel,
ProofUpgrade: proofUpgrade,
ProofHeight: proofHeight,
Signer: suite.chainA.SenderAccount.GetAddress().String(),
}
},
func(res *channeltypes.MsgChannelUpgradeConfirmResponse, err error) {
suite.Require().NoError(err)
suite.Require().NotNil(res)
suite.Require().Equal(channeltypes.SUCCESS, res.Result)

channel := path.EndpointA.GetChannel()
suite.Require().Equal(channeltypes.FLUSHING, channel.State)
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

channel = path.EndpointB.GetChannel()
suite.Require().Equal(channeltypes.FLUSHCOMPLETE, channel.State)
suite.Require().Equal(uint64(1), channel.UpgradeSequence)
},
},
{
"success, pending in-flight packets on try chain",
func() {
portID, channelID := path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID
suite.chainB.GetSimApp().IBCKeeper.ChannelKeeper.SetPacketCommitment(suite.chainB.GetContext(), portID, channelID, 1, []byte("hash"))
},
func(res *channeltypes.MsgChannelUpgradeConfirmResponse, err error) {
Expand Down
Loading