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

Chore: remove event emission on channel upgrade #6063

Merged
merged 20 commits into from
Apr 9, 2024
Merged

Chore: remove event emission on channel upgrade #6063

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
26fc764
remove event emission
hoangdv2429 Mar 27, 2024
8aa4e02
Merge branch 'main' into chore/trim_event_emissions
hoangdv2429 Mar 27, 2024
b5840a0
Update events.go
hoangdv2429 Mar 27, 2024
ced7b32
update test acrroding
hoangdv2429 Mar 27, 2024
b7949a6
Merge branch 'main' into chore/trim_event_emissions
hoangdv2429 Mar 27, 2024
9294811
Merge branch 'main' into chore/trim_event_emissions
hoangdv2429 Mar 29, 2024
51964dd
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Mar 30, 2024
1449925
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Mar 31, 2024
e590747
Merge branch 'main' into chore/trim_event_emissions
hoangdv2429 Apr 1, 2024
e2d4583
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 2, 2024
d5989d9
Merge branch 'main' into chore/trim_event_emissions
charleenfei Apr 3, 2024
2dbfd46
update hermes tag
crodriguezvega Apr 3, 2024
c481fce
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 3, 2024
0efb797
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 3, 2024
77546f8
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 8, 2024
1834387
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 8, 2024
c7b17f0
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 8, 2024
b0ad66c
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 8, 2024
31edbd0
Merge branch 'main' into chore/trim_event_emissions
hoangdv2429 Apr 8, 2024
639362f
Merge branch 'main' into chore/trim_event_emissions
crodriguezvega Apr 9, 2024
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 e2e/testsuite/testconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const (
// TODO: https://github.com/cosmos/ibc-go/issues/4965
defaultHyperspaceTag = "20231122v39"
// defaultHermesTag is the tag that will be used if no relayer tag is specified for hermes.
defaultHermesTag = "luca_joss-channel-upgrade-authority"
defaultHermesTag = "sean-channel-upgradability"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have we been using this tag for the last few months?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were using luca_joss-..., but when these attributes were removed, Luca discovered while debugging that there was a bug in hermes and fixed it in this new tag.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For more context, the branch sean-channel-upgradability was the branch for the channel upgrade beta implementation and the luca_joss-channel-upgrade-authority was the branch adding the changes that came after the beta (e.g. initiating an upgrade only with authority). Between the release of channel upgrade and now the branch luca_joss-channel-upgrade-authority has been merged in sean-channel-upgradability so that we only have one open PR related to channel upgrade. New Hermes Docker images for channel upgrade, until it is merged, will be in the tag sean-channel-upgradability.

// defaultChainTag is the tag that will be used for the chains if none is specified.
defaultChainTag = "main"
// defaultConfigFileName is the default filename for the config file that can be used to configure
Expand Down
18 changes: 0 additions & 18 deletions modules/core/04-channel/keeper/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ func EmitChannelUpgradeInitEvent(ctx sdk.Context, portID string, channelID strin
sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, upgrade.Fields.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, upgrade.Fields.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, upgrade.Fields.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
),
sdk.NewEvent(
Expand All @@ -301,9 +298,6 @@ func EmitChannelUpgradeTryEvent(ctx sdk.Context, portID string, channelID string
sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, upgrade.Fields.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, upgrade.Fields.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, upgrade.Fields.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
),
sdk.NewEvent(
Expand All @@ -322,9 +316,6 @@ func EmitChannelUpgradeAckEvent(ctx sdk.Context, portID string, channelID string
sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, upgrade.Fields.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, upgrade.Fields.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, upgrade.Fields.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
),
sdk.NewEvent(
Expand Down Expand Up @@ -363,9 +354,6 @@ func EmitChannelUpgradeOpenEvent(ctx sdk.Context, portID string, channelID strin
sdk.NewAttribute(types.AttributeKeyChannelState, channel.State.String()),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, channel.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, channel.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, channel.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
),
sdk.NewEvent(
Expand All @@ -384,9 +372,6 @@ func EmitChannelUpgradeTimeoutEvent(ctx sdk.Context, portID string, channelID st
sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, upgrade.Fields.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, upgrade.Fields.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, upgrade.Fields.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeTimeoutHeight, upgrade.Timeout.Height.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeTimeoutTimestamp, fmt.Sprintf("%d", upgrade.Timeout.Timestamp)),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
Expand Down Expand Up @@ -426,9 +411,6 @@ func EmitChannelUpgradeCancelEvent(ctx sdk.Context, portID string, channelID str
sdk.NewAttribute(types.AttributeKeyChannelID, channelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionHops, upgrade.Fields.ConnectionHops[0]),
sdk.NewAttribute(types.AttributeKeyVersion, upgrade.Fields.Version),
sdk.NewAttribute(types.AttributeKeyOrdering, upgrade.Fields.Ordering.String()),
sdk.NewAttribute(types.AttributeKeyUpgradeSequence, fmt.Sprintf("%d", channel.UpgradeSequence)),
),
sdk.NewEvent(
Expand Down
59 changes: 0 additions & 59 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 @@ -932,8 +932,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeInit() {
suite.Require().NoError(err)
suite.Require().NotNil(res)
suite.Require().Equal(uint64(1), res.UpgradeSequence)

upgrade := path.EndpointA.GetChannelUpgrade()
channel := path.EndpointA.GetChannel()

expEvents := ibctesting.EventsMap{
Expand All @@ -942,9 +940,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeInit() {
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: upgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: upgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: upgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -1078,17 +1073,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeTry() {
suite.Require().Equal(channeltypes.FLUSHING, channel.State)
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

upgrade := path.EndpointB.GetChannelUpgrade()

expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeTry: {
channeltypes.AttributeKeyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeKeyConnectionHops: upgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: upgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: upgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -1265,17 +1255,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeAck() {
suite.Require().Equal(channeltypes.FLUSHCOMPLETE, channel.State)
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

upgrade := path.EndpointA.GetChannelUpgrade()

expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeAck: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: upgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: upgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: upgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand All @@ -1302,17 +1287,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeAck() {
suite.Require().Equal(channeltypes.FLUSHING, channel.State)
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

upgrade := path.EndpointA.GetChannelUpgrade()

expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeAck: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: upgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: upgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: upgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -1580,9 +1560,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeConfirm() {
channeltypes.AttributeCounterpartyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeKeyChannelState: channeltypes.OPEN.String(),
channeltypes.AttributeKeyConnectionHops: channel.ConnectionHops[0],
channeltypes.AttributeKeyVersion: channel.Version,
channeltypes.AttributeKeyOrdering: channel.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -1873,9 +1850,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeOpen() {
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyChannelState: channeltypes.OPEN.String(),
channeltypes.AttributeKeyConnectionHops: channel.ConnectionHops[0],
channeltypes.AttributeKeyVersion: channel.Version,
channeltypes.AttributeKeyOrdering: channel.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -1919,9 +1893,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeOpen() {
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyChannelState: channeltypes.OPEN.String(),
channeltypes.AttributeKeyConnectionHops: channel.ConnectionHops[0],
channeltypes.AttributeKeyVersion: channel.Version,
channeltypes.AttributeKeyOrdering: channel.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
sdk.EventTypeMessage: {
Expand Down Expand Up @@ -2055,17 +2026,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeCancel() {
// Upgrade sequence should be changed to match sequence on error receipt.
suite.Require().Equal(uint64(2), channel.UpgradeSequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeCancel: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
channeltypes.EventTypeChannelUpgradeError: {
Expand Down Expand Up @@ -2104,17 +2070,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeCancel() {
// Upgrade sequence should be changed to match initial upgrade sequence.
suite.Require().Equal(uint64(3), channel.UpgradeSequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeCancel: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
channeltypes.EventTypeChannelUpgradeError: {
Expand Down Expand Up @@ -2154,17 +2115,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeCancel() {
// Upgrade sequence should be changed to match initial upgrade sequence.
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeCancel: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
channeltypes.EventTypeChannelUpgradeError: {
Expand Down Expand Up @@ -2204,17 +2160,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeCancel() {
// Upgrade sequence should be changed to match initial upgrade sequence.
suite.Require().Equal(uint64(1), channel.UpgradeSequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeCancel: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
channeltypes.EventTypeChannelUpgradeError: {
Expand Down Expand Up @@ -2253,17 +2204,12 @@ func (suite *KeeperTestSuite) TestChannelUpgradeCancel() {
// Upgrade sequence should not be changed.
suite.Require().Equal(uint64(2), channel.UpgradeSequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
expEvents := ibctesting.EventsMap{
channeltypes.EventTypeChannelUpgradeCancel: {
channeltypes.AttributeKeyPortID: path.EndpointA.ChannelConfig.PortID,
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
},
channeltypes.EventTypeChannelUpgradeError: {
Expand Down Expand Up @@ -2428,8 +2374,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeTimeout() {
suite.Require().True(found)
suite.Require().Equal(uint64(1), errorReceipt.Sequence)

// we need to find the event values from the proposed upgrade as the actual upgrade has been deleted.
proposedUpgrade := path.EndpointA.GetProposedUpgrade()
// use the timeout we set in the malleate function
timeout := channeltypes.NewTimeout(clienttypes.ZeroHeight(), 1)
expEvents := ibctesting.EventsMap{
Expand All @@ -2438,9 +2382,6 @@ func (suite *KeeperTestSuite) TestChannelUpgradeTimeout() {
channeltypes.AttributeKeyChannelID: path.EndpointA.ChannelID,
channeltypes.AttributeCounterpartyPortID: path.EndpointB.ChannelConfig.PortID,
channeltypes.AttributeCounterpartyChannelID: path.EndpointB.ChannelID,
channeltypes.AttributeKeyConnectionHops: proposedUpgrade.Fields.ConnectionHops[0],
channeltypes.AttributeKeyVersion: proposedUpgrade.Fields.Version,
channeltypes.AttributeKeyOrdering: proposedUpgrade.Fields.Ordering.String(),
channeltypes.AttributeKeyUpgradeTimeoutHeight: timeout.Height.String(),
channeltypes.AttributeKeyUpgradeTimeoutTimestamp: fmt.Sprintf("%d", timeout.Timestamp),
channeltypes.AttributeKeyUpgradeSequence: fmt.Sprintf("%d", channel.UpgradeSequence),
Expand Down
Loading