Skip to content

Commit

Permalink
fix: add MsgPruneAcknowledgements to codec registration (#5481)
Browse files Browse the repository at this point in the history 
(cherry picked from commit 947b15e)

# Conflicts:
#	modules/core/04-channel/types/codec.go
  • Loading branch information
@damiannolan @mergify
damiannolan authored and mergify[bot] committed Dec 21, 2023
1 parent 1101972 commit 3ff2738
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 0 deletions.
12 changes: 12 additions & 0 deletions modules/core/04-channel/types/codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,18 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
&MsgAcknowledgement{},
&MsgTimeout{},
&MsgTimeoutOnClose{},
<<<<<<< HEAD

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (amd64) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm64) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

expected operand, found '<<' (typecheck)

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (03) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

syntax error: unexpected <<, expected expression

Check failure on line 42 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (00) 

syntax error: unexpected <<, expected expression
=======
&MsgChannelUpgradeInit{},

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (amd64) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm64) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (03) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

syntax error: unexpected } in argument list; possibly missing comma or )

Check failure on line 44 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (00) 

syntax error: unexpected } in argument list; possibly missing comma or )
&MsgChannelUpgradeTry{},
&MsgChannelUpgradeAck{},
&MsgChannelUpgradeConfirm{},
&MsgChannelUpgradeOpen{},
&MsgChannelUpgradeTimeout{},
&MsgChannelUpgradeCancel{},
&MsgPruneAcknowledgements{},
&MsgUpdateParams{},
>>>>>>> 947b15ed (fix: add MsgPruneAcknowledgements to codec registration (#5481))

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (amd64) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm64) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / build (arm) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (02) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

invalid character U+0023 '#' (typecheck)

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / lint 

illegal character U+0023 '#' (typecheck)

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (03) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (01) 

invalid character U+0023 '#'

Check failure on line 53 in modules/core/04-channel/types/codec.go

View workflow job for this annotation

GitHub Actions / tests (00) 

invalid character U+0023 '#'
)

msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
Expand Down
45 changes: 45 additions & 0 deletions modules/core/04-channel/types/codec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,51 @@ func TestCodecTypeRegistration(t *testing.T) {
sdk.MsgTypeURL(&types.MsgTimeoutOnClose{}),
true,
},
{
"success: MsgChannelUpgradeInit",
sdk.MsgTypeURL(&types.MsgChannelUpgradeInit{}),
true,
},
{
"success: MsgChannelUpgradeTry",
sdk.MsgTypeURL(&types.MsgChannelUpgradeTry{}),
true,
},
{
"success: MsgChannelUpgradeAck",
sdk.MsgTypeURL(&types.MsgChannelUpgradeAck{}),
true,
},
{
"success: MsgChannelUpgradeConfirm",
sdk.MsgTypeURL(&types.MsgChannelUpgradeConfirm{}),
true,
},
{
"success: MsgChannelUpgradeOpen",
sdk.MsgTypeURL(&types.MsgChannelUpgradeOpen{}),
true,
},
{
"success: MsgChannelUpgradeTimeout",
sdk.MsgTypeURL(&types.MsgChannelUpgradeTimeout{}),
true,
},
{
"success: MsgChannelUpgradeCancel",
sdk.MsgTypeURL(&types.MsgChannelUpgradeCancel{}),
true,
},
{
"success: MsgPruneAcknowledgements",
sdk.MsgTypeURL(&types.MsgPruneAcknowledgements{}),
true,
},
{
"success: MsgUpdateParams",
sdk.MsgTypeURL(&types.MsgUpdateParams{}),
true,
},
{
"type not registered on codec",
"ibc.invalid.MsgTypeURL",
Expand Down

0 comments on commit 3ff2738

Please sign in to comment.