From 8c096f5660695deddc1e00598d2f86a712d7022a Mon Sep 17 00:00:00 2001 From: chandiniv1 Date: Tue, 19 Dec 2023 10:18:44 +0530 Subject: [PATCH 1/3] fix validations --- modules/apps/29-fee/types/msgs.go | 4 ---- modules/apps/29-fee/types/msgs_test.go | 8 -------- 2 files changed, 12 deletions(-) diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go index be3a3c5f860..c2d8ba364e6 100644 --- a/modules/apps/29-fee/types/msgs.go +++ b/modules/apps/29-fee/types/msgs.go @@ -46,10 +46,6 @@ func (msg MsgRegisterPayee) ValidateBasic() error { return err } - if msg.Relayer == msg.Payee { - return errorsmod.Wrap(ibcerrors.ErrInvalidRequest, "relayer address and payee must not be equal") - } - _, err := sdk.AccAddressFromBech32(msg.Relayer) if err != nil { return errorsmod.Wrap(err, "failed to create sdk.AccAddress from relayer address") diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go index 68195180ba0..26c29de8de3 100644 --- a/modules/apps/29-fee/types/msgs_test.go +++ b/modules/apps/29-fee/types/msgs_test.go @@ -43,14 +43,6 @@ func TestMsgRegisterPayeeValidation(t *testing.T) { }, false, }, - { - "invalid request relayer and payee are equal", - func() { - msg.Relayer = defaultAccAddress - msg.Payee = defaultAccAddress - }, - false, - }, { "invalid relayer address", func() { From f63f89680002a3dd604d7eab42b5eafc82ded724 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 19 Dec 2023 09:06:52 +0100 Subject: [PATCH 2/3] add success test where relayer and payee address are equal --- modules/apps/29-fee/types/msgs_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go index 26c29de8de3..6657716b5ff 100644 --- a/modules/apps/29-fee/types/msgs_test.go +++ b/modules/apps/29-fee/types/msgs_test.go @@ -29,6 +29,14 @@ func TestMsgRegisterPayeeValidation(t *testing.T) { func() {}, true, }, + { + "success: relayer and payee are equal", + func() { + msg.Relayer = defaultAccAddress + msg.Payee = defaultAccAddress + }, + true, + }, { "invalid portID", func() { From 1b495ab2fae0ceb4d5a01f792bcb7661ef246219 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 19 Dec 2023 09:37:22 +0100 Subject: [PATCH 3/3] lint --- modules/apps/29-fee/types/msgs_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/apps/29-fee/types/msgs_test.go b/modules/apps/29-fee/types/msgs_test.go index 6657716b5ff..f501b5ab20b 100644 --- a/modules/apps/29-fee/types/msgs_test.go +++ b/modules/apps/29-fee/types/msgs_test.go @@ -30,13 +30,13 @@ func TestMsgRegisterPayeeValidation(t *testing.T) { true, }, { - "success: relayer and payee are equal", - func() { - msg.Relayer = defaultAccAddress - msg.Payee = defaultAccAddress - }, - true, - }, + "success: relayer and payee are equal", + func() { + msg.Relayer = defaultAccAddress + msg.Payee = defaultAccAddress + }, + true, + }, { "invalid portID", func() {