From 551a945337e4864d3f2dafd25148dd915e252072 Mon Sep 17 00:00:00 2001 From: Daniel T <30197399+danwt@users.noreply.github.com> Date: Tue, 21 May 2024 13:11:04 +0100 Subject: [PATCH] fix(code standards): rename fullfilled -> fulfilled (#895) --- docs/static/openapi.yml | 10 ++-- ibctesting/eibc_test.go | 4 +- proto/dymension/eibc/demand_order.proto | 2 +- proto/dymension/eibc/tx.proto | 4 +- x/delayedack/keeper/hooks.go | 2 +- x/eibc/keeper/keeper.go | 2 +- x/eibc/keeper/msg_server.go | 4 +- x/eibc/keeper/msg_server_test.go | 24 ++++----- x/eibc/types/demand_order.go | 4 +- x/eibc/types/demand_order.pb.go | 67 ++++++++++++------------- x/eibc/types/errors.go | 22 ++++---- x/eibc/types/tx.pb.go | 4 +- x/eibc/types/types.go | 2 +- 13 files changed, 75 insertions(+), 76 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 7fa3cbabf..5d44ea77b 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -690,7 +690,7 @@ paths: signatures required by gogoproto. recipient: type: string - is_fullfilled: + is_fulfilled: type: boolean tracking_packet_status: type: string @@ -801,7 +801,7 @@ paths: signatures required by gogoproto. recipient: type: string - is_fullfilled: + is_fulfilled: type: boolean tracking_packet_status: type: string @@ -53288,7 +53288,7 @@ definitions: signatures required by gogoproto. recipient: type: string - is_fullfilled: + is_fulfilled: type: boolean tracking_packet_status: type: string @@ -53366,7 +53366,7 @@ definitions: signatures required by gogoproto. recipient: type: string - is_fullfilled: + is_fulfilled: type: boolean tracking_packet_status: type: string @@ -53437,7 +53437,7 @@ definitions: signatures required by gogoproto. recipient: type: string - is_fullfilled: + is_fulfilled: type: boolean tracking_packet_status: type: string diff --git a/ibctesting/eibc_test.go b/ibctesting/eibc_test.go index eccf1d1d1..5760c09e9 100644 --- a/ibctesting/eibc_test.go +++ b/ibctesting/eibc_test.go @@ -259,7 +259,7 @@ func (suite *EIBCTestSuite) TestEIBCDemandOrderFulfillment() { // Get last demand order created by TrackingPacketKey. Last part of the key is the sequence lastDemandOrder := getLastDemandOrderByChannelAndSequence(demandOrders) // Validate demand order wasn't fulfilled but finalized - suite.Require().False(lastDemandOrder.IsFullfilled) + suite.Require().False(lastDemandOrder.IsFulfilled) suite.Require().Equal(commontypes.Status_FINALIZED, lastDemandOrder.TrackingPacketStatus) } @@ -335,7 +335,7 @@ func (suite *EIBCTestSuite) TestEIBCDemandOrderFulfillment() { } } suite.Require().NotNil(finalizedDemandOrder) - suite.Require().True(finalizedDemandOrder.IsFullfilled) + suite.Require().True(finalizedDemandOrder.IsFulfilled) suite.Require().Equal(commontypes.Status_FINALIZED, finalizedDemandOrder.TrackingPacketStatus) path.EndpointA.Chain.NextBlock() diff --git a/proto/dymension/eibc/demand_order.proto b/proto/dymension/eibc/demand_order.proto index a5c377a95..23436ee15 100644 --- a/proto/dymension/eibc/demand_order.proto +++ b/proto/dymension/eibc/demand_order.proto @@ -25,6 +25,6 @@ message DemandOrder { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; string recipient = 5; - bool is_fullfilled = 6; + bool is_fulfilled = 6; dymensionxyz.dymension.common.Status tracking_packet_status = 8; } \ No newline at end of file diff --git a/proto/dymension/eibc/tx.proto b/proto/dymension/eibc/tx.proto index b4d894b0a..24afc1cfc 100644 --- a/proto/dymension/eibc/tx.proto +++ b/proto/dymension/eibc/tx.proto @@ -8,12 +8,12 @@ service Msg { rpc FulfillOrder(MsgFulfillOrder) returns (MsgFulfillOrderResponse) {} } -// MsgFulfillOrder defines the FullfillOrder request type. +// MsgFulfillOrder defines the FulfillOrder request type. message MsgFulfillOrder { // fulfiller_address is the bech32-encoded address of the account which the message was sent from. string fulfiller_address = 1; string order_id = 2; } -// MsgFulfillOrderResponse defines the FullfillOrder response type. +// MsgFulfillOrderResponse defines the FulfillOrder response type. message MsgFulfillOrderResponse {} \ No newline at end of file diff --git a/x/delayedack/keeper/hooks.go b/x/delayedack/keeper/hooks.go index 5ac450d62..925414447 100644 --- a/x/delayedack/keeper/hooks.go +++ b/x/delayedack/keeper/hooks.go @@ -29,7 +29,7 @@ func (k Keeper) GetEIBCHooks() eibctypes.EIBCHooks { } // AfterDemandOrderFulfilled is called every time a demand order is fulfilled. -// Once it is fulfilled the underlying packet recipient should be updated to the fullfiller. +// Once it is fulfilled the underlying packet recipient should be updated to the fulfiller. func (k eibcHooks) AfterDemandOrderFulfilled(ctx sdk.Context, demandOrder *eibctypes.DemandOrder, fulfillerAddress string) error { err := k.UpdateRollappPacketTransferAddress(ctx, demandOrder.TrackingPacketKey, fulfillerAddress) if err != nil { diff --git a/x/eibc/keeper/keeper.go b/x/eibc/keeper/keeper.go index 208eb8078..bdb24ff34 100644 --- a/x/eibc/keeper/keeper.go +++ b/x/eibc/keeper/keeper.go @@ -106,7 +106,7 @@ func (k *Keeper) UpdateDemandOrderWithStatus(ctx sdk.Context, demandOrder *types // FulfillOrder should be called only at most once per order. func (k Keeper) FulfillOrder(ctx sdk.Context, order *types.DemandOrder, fulfillerAddress sdk.AccAddress) error { - order.IsFullfilled = true + order.IsFulfilled = true err := k.SetDemandOrder(ctx, order) if err != nil { return err diff --git a/x/eibc/keeper/msg_server.go b/x/eibc/keeper/msg_server.go index 514d08f4b..bde51c4eb 100644 --- a/x/eibc/keeper/msg_server.go +++ b/x/eibc/keeper/msg_server.go @@ -34,7 +34,7 @@ func (m msgServer) FulfillOrder(goCtx context.Context, msg *types.MsgFulfillOrde return nil, err } // Check that the order is not fulfilled yet - if demandOrder.IsFullfilled { + if demandOrder.IsFulfilled { return nil, types.ErrDemandAlreadyFulfilled } // Check the underlying packet is still relevant (i.e not expired, rejected, reverted) @@ -48,7 +48,7 @@ func (m msgServer) FulfillOrder(goCtx context.Context, msg *types.MsgFulfillOrde // Check that the fulfiller has enough balance to fulfill the order fulfillerAccount := m.GetAccount(ctx, msg.GetFulfillerBech32Address()) if fulfillerAccount == nil { - return nil, types.ErrFullfillerAddressDoesNotExist + return nil, types.ErrFulfillerAddressDoesNotExist } // Send the funds from the fulfiller to the eibc packet original recipient err = m.BankKeeper.SendCoins(ctx, fulfillerAccount.GetAddress(), demandOrder.GetRecipientBech32Address(), demandOrder.Price) diff --git a/x/eibc/keeper/msg_server_test.go b/x/eibc/keeper/msg_server_test.go index 08bf7d2ad..f9c6cb6ff 100644 --- a/x/eibc/keeper/msg_server_test.go +++ b/x/eibc/keeper/msg_server_test.go @@ -46,7 +46,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, expectedPostFulfillmentEventsType: eibcEventType, @@ -55,7 +55,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "true"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "true"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, }, @@ -75,7 +75,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, expectedPostFulfillmentEventsType: eibcEventType, @@ -84,7 +84,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, }, @@ -104,7 +104,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150adym"), sdk.NewAttribute(types.AttributeKeyFee, "50adym"), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, expectedPostFulfillmentEventsType: eibcEventType, @@ -113,7 +113,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150adym"), sdk.NewAttribute(types.AttributeKeyFee, "50adym"), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, }, @@ -133,7 +133,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "true"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "true"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, expectedPostFulfillmentEventsType: eibcEventType, @@ -142,7 +142,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "true"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "true"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_PENDING.String()), }, }, @@ -162,7 +162,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_FINALIZED.String()), }, expectedPostFulfillmentEventsType: eibcEventType, @@ -171,7 +171,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { sdk.NewAttribute(types.AttributeKeyId, types.BuildDemandIDFromPacketKey(string(rollappPacketKey))), sdk.NewAttribute(types.AttributeKeyPrice, "150"+sdk.DefaultBondDenom), sdk.NewAttribute(types.AttributeKeyFee, "50"+sdk.DefaultBondDenom), - sdk.NewAttribute(types.AttributeKeyIsFullfilled, "false"), + sdk.NewAttribute(types.AttributeKeyIsFulfilled, "false"), sdk.NewAttribute(types.AttributeKeyPacketStatus, commontypes.Status_FINALIZED.String()), }, }, @@ -189,7 +189,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { suite.App.DelayedAckKeeper.SetRollappPacket(suite.Ctx, *rollappPacket) // Create new demand order demandOrder := types.NewDemandOrder(*rollappPacket, math.NewIntFromUint64(tc.demandOrderPrice), math.NewIntFromUint64(tc.demandOrderFee), tc.demandOrderDenom, eibcSupplyAddr.String()) - demandOrder.IsFullfilled = tc.demandOrderFulfillmentStatus + demandOrder.IsFulfilled = tc.demandOrderFulfillmentStatus err := suite.App.EIBCKeeper.SetDemandOrder(suite.Ctx, demandOrder) suite.Require().NoError(err) // Update rollapp status if needed @@ -219,7 +219,7 @@ func (suite *KeeperTestSuite) TestMsgFulfillOrder() { // Check that the demand fulfillment demandOrder, err = suite.App.EIBCKeeper.GetDemandOrder(suite.Ctx, tc.demandOrderUnderlyingPacketStatus, demandOrder.Id) suite.Require().NoError(err) - suite.Assert().Equal(tc.expectedDemandOrdefFulfillmentStatus, demandOrder.IsFullfilled) + suite.Assert().Equal(tc.expectedDemandOrdefFulfillmentStatus, demandOrder.IsFulfilled) // Check balances updates in case of success if tc.expectedFulfillmentError == nil { afterFulfillmentSupplyAddrBalance := suite.App.BankKeeper.GetBalance(suite.Ctx, eibcSupplyAddr, sdk.DefaultBondDenom) diff --git a/x/eibc/types/demand_order.go b/x/eibc/types/demand_order.go index 77c0c79e0..157849e5a 100644 --- a/x/eibc/types/demand_order.go +++ b/x/eibc/types/demand_order.go @@ -23,7 +23,7 @@ func NewDemandOrder(rollappPacket commontypes.RollappPacket, price, fee math.Int Price: sdk.NewCoins(sdk.NewCoin(denom, price)), Fee: sdk.NewCoins(sdk.NewCoin(denom, fee)), Recipient: recipient, - IsFullfilled: false, + IsFulfilled: false, TrackingPacketStatus: commontypes.Status_PENDING, } } @@ -67,7 +67,7 @@ func (m *DemandOrder) GetEvents() []sdk.Attribute { sdk.NewAttribute(AttributeKeyId, m.Id), sdk.NewAttribute(AttributeKeyPrice, m.Price.String()), sdk.NewAttribute(AttributeKeyFee, m.Fee.String()), - sdk.NewAttribute(AttributeKeyIsFullfilled, strconv.FormatBool(m.IsFullfilled)), + sdk.NewAttribute(AttributeKeyIsFulfilled, strconv.FormatBool(m.IsFulfilled)), sdk.NewAttribute(AttributeKeyPacketStatus, m.TrackingPacketStatus.String()), } return eventAttributes diff --git a/x/eibc/types/demand_order.pb.go b/x/eibc/types/demand_order.pb.go index e5d801c7b..a4fc03be2 100644 --- a/x/eibc/types/demand_order.pb.go +++ b/x/eibc/types/demand_order.pb.go @@ -38,7 +38,7 @@ type DemandOrder struct { // fee is the effective profit made by the fulfiller because they pay price and receive fee + price Fee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=fee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"fee"` Recipient string `protobuf:"bytes,5,opt,name=recipient,proto3" json:"recipient,omitempty"` - IsFullfilled bool `protobuf:"varint,6,opt,name=is_fullfilled,json=isFullfilled,proto3" json:"is_fullfilled,omitempty"` + IsFulfilled bool `protobuf:"varint,6,opt,name=is_fulfilled,json=isFulfilled,proto3" json:"is_fulfilled,omitempty"` TrackingPacketStatus types1.Status `protobuf:"varint,8,opt,name=tracking_packet_status,json=trackingPacketStatus,proto3,enum=dymensionxyz.dymension.common.Status" json:"tracking_packet_status,omitempty"` } @@ -110,9 +110,9 @@ func (m *DemandOrder) GetRecipient() string { return "" } -func (m *DemandOrder) GetIsFullfilled() bool { +func (m *DemandOrder) GetIsFulfilled() bool { if m != nil { - return m.IsFullfilled + return m.IsFulfilled } return false } @@ -131,33 +131,32 @@ func init() { func init() { proto.RegisterFile("dymension/eibc/demand_order.proto", fileDescriptor_3808f42eed32f331) } var fileDescriptor_3808f42eed32f331 = []byte{ - // 402 bytes of a gzipped FileDescriptorProto + // 400 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0xcd, 0x6e, 0xd4, 0x30, - 0x10, 0x4e, 0x36, 0xb4, 0x6a, 0x5d, 0xa8, 0x84, 0xa9, 0x50, 0x28, 0x90, 0x06, 0x10, 0x52, 0x2e, - 0xd8, 0x6c, 0xfb, 0x06, 0x05, 0x71, 0xe9, 0x01, 0x14, 0x6e, 0x20, 0x14, 0x25, 0xf6, 0x6c, 0xb0, - 0x92, 0xd8, 0x51, 0xec, 0xad, 0x36, 0x3c, 0x05, 0xcf, 0xc1, 0x85, 0xd7, 0xd8, 0xe3, 0x1e, 0x39, - 0x01, 0xda, 0x7d, 0x11, 0x14, 0x7b, 0xd9, 0x5d, 0x90, 0xb8, 0x71, 0xb2, 0x67, 0xbe, 0x6f, 0xe6, - 0x9b, 0x3f, 0xf4, 0x88, 0xf7, 0x0d, 0x48, 0x2d, 0x94, 0xa4, 0x20, 0x0a, 0x46, 0x39, 0x34, 0xb9, - 0xe4, 0x99, 0xea, 0x38, 0x74, 0xa4, 0xed, 0x94, 0x51, 0xf8, 0xfe, 0x86, 0x32, 0xeb, 0x3f, 0x91, - 0x8d, 0x41, 0x06, 0xfe, 0xe9, 0x49, 0xa9, 0x4a, 0x65, 0x79, 0x74, 0xf8, 0xb9, 0x90, 0xd3, 0x87, - 0xdb, 0xac, 0x4c, 0x35, 0x8d, 0x92, 0x54, 0x9b, 0xdc, 0x4c, 0xf5, 0x1a, 0x8e, 0x98, 0xd2, 0x8d, - 0xd2, 0xb4, 0xc8, 0x35, 0xd0, 0xeb, 0x71, 0x01, 0x26, 0x1f, 0x53, 0xa6, 0x84, 0x74, 0xf8, 0xe3, - 0xaf, 0x01, 0x3a, 0x7a, 0x69, 0x0b, 0x79, 0x3d, 0xd4, 0x81, 0x8f, 0xd1, 0x48, 0xf0, 0xd0, 0x8f, - 0xfd, 0xe4, 0x30, 0x1d, 0x09, 0x8e, 0x09, 0xba, 0x63, 0xba, 0x9c, 0x55, 0x42, 0x96, 0x59, 0x9b, - 0xb3, 0x0a, 0x4c, 0x56, 0x41, 0x1f, 0x8e, 0x2c, 0xe1, 0xf6, 0x6f, 0xe8, 0x8d, 0x45, 0xae, 0xa0, - 0xc7, 0x39, 0xda, 0x6b, 0x3b, 0xc1, 0x20, 0x0c, 0xe2, 0x20, 0x39, 0x3a, 0xbf, 0x47, 0x9c, 0x3e, - 0x19, 0xf4, 0xc9, 0x5a, 0x9f, 0xbc, 0x50, 0x42, 0x5e, 0x3e, 0x9f, 0x7f, 0x3f, 0xf3, 0xbe, 0xfc, - 0x38, 0x4b, 0x4a, 0x61, 0x3e, 0x4e, 0x0b, 0xc2, 0x54, 0x43, 0xd7, 0xc5, 0xba, 0xe7, 0x99, 0xe6, - 0x15, 0x35, 0x7d, 0x0b, 0xda, 0x06, 0xe8, 0xd4, 0x65, 0xc6, 0x1f, 0x50, 0x30, 0x01, 0x08, 0x6f, - 0xfc, 0x7f, 0x81, 0x21, 0x2f, 0x7e, 0x80, 0x0e, 0x3b, 0x60, 0xa2, 0x15, 0x20, 0x4d, 0xb8, 0x67, - 0xfb, 0xdc, 0x3a, 0xf0, 0x13, 0x74, 0x4b, 0xe8, 0x6c, 0x32, 0xad, 0xeb, 0x89, 0xa8, 0x6b, 0xe0, - 0xe1, 0x7e, 0xec, 0x27, 0x07, 0xe9, 0x4d, 0xa1, 0x5f, 0x6d, 0x7c, 0xf8, 0x3d, 0xba, 0xfb, 0xf7, - 0xd0, 0xdc, 0x52, 0xc2, 0x83, 0xd8, 0x4f, 0x8e, 0xcf, 0x9f, 0x92, 0x7f, 0xec, 0xd9, 0x6d, 0x90, - 0xbc, 0xb5, 0xe4, 0xf4, 0xe4, 0xcf, 0xf1, 0x3a, 0xef, 0xe5, 0xd5, 0x7c, 0x19, 0xf9, 0x8b, 0x65, - 0xe4, 0xff, 0x5c, 0x46, 0xfe, 0xe7, 0x55, 0xe4, 0x2d, 0x56, 0x91, 0xf7, 0x6d, 0x15, 0x79, 0xef, - 0xc6, 0x3b, 0x8d, 0xee, 0x0a, 0x6c, 0x0d, 0x7a, 0x7d, 0x41, 0x67, 0xee, 0xfa, 0x6c, 0xdf, 0xc5, - 0xbe, 0xbd, 0x82, 0x8b, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xf4, 0x5f, 0x7a, 0x9c, 0x02, - 0x00, 0x00, + 0x10, 0x4e, 0x36, 0xb4, 0x6a, 0xbd, 0xa8, 0x12, 0xa6, 0x42, 0xa1, 0x40, 0x9a, 0x22, 0x21, 0xe5, + 0x82, 0xcd, 0xb6, 0x6f, 0x50, 0x10, 0x97, 0x1e, 0x40, 0xe1, 0x06, 0x42, 0x51, 0x62, 0xcf, 0x06, + 0x2b, 0x1b, 0x3b, 0x8a, 0xbd, 0xd5, 0x86, 0xa7, 0xe0, 0x39, 0x90, 0x78, 0x8f, 0x3d, 0xee, 0x91, + 0x13, 0xa0, 0xdd, 0x17, 0x41, 0xb1, 0xf7, 0x0f, 0x24, 0x6e, 0x9c, 0xec, 0x99, 0xef, 0x9b, 0xf9, + 0xe6, 0x0f, 0x5d, 0xf0, 0xae, 0x06, 0xa9, 0x85, 0x92, 0x14, 0x44, 0xc1, 0x28, 0x87, 0x3a, 0x97, + 0x3c, 0x53, 0x2d, 0x87, 0x96, 0x34, 0xad, 0x32, 0x0a, 0x3f, 0xda, 0x52, 0x66, 0xdd, 0x67, 0xb2, + 0x35, 0x48, 0xcf, 0x3f, 0x3b, 0x2d, 0x55, 0xa9, 0x2c, 0x8f, 0xf6, 0x3f, 0x17, 0x72, 0xf6, 0x64, + 0x97, 0x95, 0xa9, 0xba, 0x56, 0x92, 0x6a, 0x93, 0x9b, 0xa9, 0x5e, 0xc3, 0x11, 0x53, 0xba, 0x56, + 0x9a, 0x16, 0xb9, 0x06, 0x7a, 0x3b, 0x2a, 0xc0, 0xe4, 0x23, 0xca, 0x94, 0x90, 0x0e, 0x7f, 0xfa, + 0x2d, 0x40, 0xc3, 0x57, 0xb6, 0x90, 0x37, 0x7d, 0x1d, 0xf8, 0x04, 0x0d, 0x04, 0x0f, 0xfd, 0xd8, + 0x4f, 0x8e, 0xd3, 0x81, 0xe0, 0x98, 0xa0, 0xfb, 0xa6, 0xcd, 0x59, 0x25, 0x64, 0x99, 0x35, 0x39, + 0xab, 0xc0, 0x64, 0x15, 0x74, 0xe1, 0xc0, 0x12, 0xee, 0x6d, 0xa0, 0xb7, 0x16, 0xb9, 0x81, 0x0e, + 0xe7, 0xe8, 0xa0, 0x69, 0x05, 0x83, 0x30, 0x88, 0x83, 0x64, 0x78, 0xf9, 0x90, 0x38, 0x7d, 0xd2, + 0xeb, 0x93, 0xb5, 0x3e, 0x79, 0xa9, 0x84, 0xbc, 0x7e, 0x31, 0xff, 0x71, 0xee, 0x7d, 0xfd, 0x79, + 0x9e, 0x94, 0xc2, 0x7c, 0x9a, 0x16, 0x84, 0xa9, 0x9a, 0xae, 0x8b, 0x75, 0xcf, 0x73, 0xcd, 0x2b, + 0x6a, 0xba, 0x06, 0xb4, 0x0d, 0xd0, 0xa9, 0xcb, 0x8c, 0x3f, 0xa2, 0x60, 0x0c, 0x10, 0xde, 0xf9, + 0xff, 0x02, 0x7d, 0x5e, 0xfc, 0x18, 0x1d, 0xb7, 0xc0, 0x44, 0x23, 0x40, 0x9a, 0xf0, 0xc0, 0xf6, + 0xb9, 0x73, 0xe0, 0x0b, 0x74, 0x57, 0xe8, 0x6c, 0x3c, 0x9d, 0x8c, 0xc5, 0x64, 0x02, 0x3c, 0x3c, + 0x8c, 0xfd, 0xe4, 0x28, 0x1d, 0x0a, 0xfd, 0x7a, 0xe3, 0xc2, 0x1f, 0xd0, 0x83, 0xbf, 0x47, 0xe6, + 0x56, 0x12, 0x1e, 0xc5, 0x7e, 0x72, 0x72, 0xf9, 0x8c, 0xfc, 0x63, 0xcb, 0x6e, 0x7f, 0xe4, 0x9d, + 0x25, 0xa7, 0xa7, 0x7f, 0x0e, 0xd7, 0x79, 0xaf, 0x6f, 0xe6, 0xcb, 0xc8, 0x5f, 0x2c, 0x23, 0xff, + 0xd7, 0x32, 0xf2, 0xbf, 0xac, 0x22, 0x6f, 0xb1, 0x8a, 0xbc, 0xef, 0xab, 0xc8, 0x7b, 0x3f, 0xda, + 0x6b, 0x73, 0x5f, 0x60, 0x67, 0xd0, 0xdb, 0x2b, 0x3a, 0x73, 0xb7, 0x67, 0xbb, 0x2e, 0x0e, 0xed, + 0x0d, 0x5c, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x67, 0x3c, 0x82, 0x35, 0x9a, 0x02, 0x00, 0x00, } func (m *DemandOrder) Marshal() (dAtA []byte, err error) { @@ -185,9 +184,9 @@ func (m *DemandOrder) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x40 } - if m.IsFullfilled { + if m.IsFulfilled { i-- - if m.IsFullfilled { + if m.IsFulfilled { dAtA[i] = 1 } else { dAtA[i] = 0 @@ -288,7 +287,7 @@ func (m *DemandOrder) Size() (n int) { if l > 0 { n += 1 + l + sovDemandOrder(uint64(l)) } - if m.IsFullfilled { + if m.IsFulfilled { n += 2 } if m.TrackingPacketStatus != 0 { @@ -498,7 +497,7 @@ func (m *DemandOrder) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 6: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IsFullfilled", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IsFulfilled", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -515,7 +514,7 @@ func (m *DemandOrder) Unmarshal(dAtA []byte) error { break } } - m.IsFullfilled = bool(v != 0) + m.IsFulfilled = bool(v != 0) case 8: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TrackingPacketStatus", wireType) diff --git a/x/eibc/types/errors.go b/x/eibc/types/errors.go index ea9506ba0..5fa188fa9 100644 --- a/x/eibc/types/errors.go +++ b/x/eibc/types/errors.go @@ -8,15 +8,15 @@ import ( // x/eibc module sentinel errors var ( - ErrInvalidOrderID = errorsmod.Register(ModuleName, 3, "Invalid order ID") - ErrDemandOrderDoesNotExist = errorsmod.Register(ModuleName, 5, "Demand order does not exist") - ErrDemandOrderInactive = errorsmod.Register(ModuleName, 6, "Demand order inactive") - ErrFullfillerAddressDoesNotExist = errorsmod.Register(ModuleName, 7, "Fullfiller address does not exist") - ErrInvalidRecipientAddress = errorsmod.Register(ModuleName, 8, "Invalid recipient address") - ErrBlockedAddress = errorsmod.Register(ModuleName, 9, "Can't purchase demand order for recipient with blocked address") - ErrDemandAlreadyFulfilled = errorsmod.Register(ModuleName, 10, "Demand order already fulfilled") - ErrNegativeTimeoutFee = errorsmod.Register(ModuleName, 11, "Timeout fee must be greater than or equal to 0") - ErrTooMuchTimeoutFee = errorsmod.Register(ModuleName, 12, "Timeout fee must be less than or equal to the total amount") - ErrNegativeErrAckFee = errorsmod.Register(ModuleName, 13, "Error acknowledgement fee must be greater than or equal to 0") - ErrTooMuchErrAckFee = errorsmod.Register(ModuleName, 14, "Error acknowledgement fee must be less than or equal to the total amount") + ErrInvalidOrderID = errorsmod.Register(ModuleName, 3, "Invalid order ID") + ErrDemandOrderDoesNotExist = errorsmod.Register(ModuleName, 5, "Demand order does not exist") + ErrDemandOrderInactive = errorsmod.Register(ModuleName, 6, "Demand order inactive") + ErrFulfillerAddressDoesNotExist = errorsmod.Register(ModuleName, 7, "Fulfiller address does not exist") + ErrInvalidRecipientAddress = errorsmod.Register(ModuleName, 8, "Invalid recipient address") + ErrBlockedAddress = errorsmod.Register(ModuleName, 9, "Can't purchase demand order for recipient with blocked address") + ErrDemandAlreadyFulfilled = errorsmod.Register(ModuleName, 10, "Demand order already fulfilled") + ErrNegativeTimeoutFee = errorsmod.Register(ModuleName, 11, "Timeout fee must be greater than or equal to 0") + ErrTooMuchTimeoutFee = errorsmod.Register(ModuleName, 12, "Timeout fee must be less than or equal to the total amount") + ErrNegativeErrAckFee = errorsmod.Register(ModuleName, 13, "Error acknowledgement fee must be greater than or equal to 0") + ErrTooMuchErrAckFee = errorsmod.Register(ModuleName, 14, "Error acknowledgement fee must be less than or equal to the total amount") ) diff --git a/x/eibc/types/tx.pb.go b/x/eibc/types/tx.pb.go index 3f2e4ad33..d3da8cab6 100644 --- a/x/eibc/types/tx.pb.go +++ b/x/eibc/types/tx.pb.go @@ -27,7 +27,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// MsgFulfillOrder defines the FullfillOrder request type. +// MsgFulfillOrder defines the FulfillOrder request type. type MsgFulfillOrder struct { // fulfiller_address is the bech32-encoded address of the account which the message was sent from. FulfillerAddress string `protobuf:"bytes,1,opt,name=fulfiller_address,json=fulfillerAddress,proto3" json:"fulfiller_address,omitempty"` @@ -81,7 +81,7 @@ func (m *MsgFulfillOrder) GetOrderId() string { return "" } -// MsgFulfillOrderResponse defines the FullfillOrder response type. +// MsgFulfillOrderResponse defines the FulfillOrder response type. type MsgFulfillOrderResponse struct { } diff --git a/x/eibc/types/types.go b/x/eibc/types/types.go index 4e70f3582..7fae4a2b1 100644 --- a/x/eibc/types/types.go +++ b/x/eibc/types/types.go @@ -6,6 +6,6 @@ const ( AttributeKeyId = "id" AttributeKeyPrice = "price" AttributeKeyFee = "fee" - AttributeKeyIsFullfilled = "is_fulfilled" + AttributeKeyIsFulfilled = "is_fulfilled" AttributeKeyPacketStatus = "packet_status" )