Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnletey
johnletey committed Feb 23, 2024
1 parent 363f128 commit 1735bd6
Show file tree
Hide file tree
Showing 23 changed files with 80 additions and 85 deletions.
9 changes: 2 additions & 7 deletions app/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@ import (
fiattokenfactory "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/keeper"
fiattokenfactorytypes "github.com/circlefin/noble-fiattokenfactory/x/fiattokenfactory/types"
"github.com/cosmos/cosmos-sdk/types/bech32"
<<<<<<< HEAD
"github.com/noble-assets/noble/v4/x/forwarding"
forwardingkeeper "github.com/noble-assets/noble/v4/x/forwarding/keeper"
tokenfactory "github.com/noble-assets/noble/v4/x/tokenfactory/keeper"
tokenfactorytypes "github.com/noble-assets/noble/v4/x/tokenfactory/types"
=======
"github.com/noble-assets/noble/v5/x/forwarding"
forwardingkeeper "github.com/noble-assets/noble/v5/x/forwarding/keeper"
tokenfactory "github.com/noble-assets/noble/v5/x/tokenfactory/keeper"
tokenfactorytypes "github.com/noble-assets/noble/v5/x/tokenfactory/types"
>>>>>>> d731877 (feat: forwarding accounts (#302))

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down
6 changes: 3 additions & 3 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ import (
cctpkeeper "github.com/circlefin/noble-cctp/x/cctp/keeper"
cctptypes "github.com/circlefin/noble-cctp/x/cctp/types"

"github.com/noble-assets/noble/v5/x/forwarding"
forwardingkeeper "github.com/noble-assets/noble/v5/x/forwarding/keeper"
forwardingtypes "github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding"
forwardingkeeper "github.com/noble-assets/noble/v4/x/forwarding/keeper"
forwardingtypes "github.com/noble-assets/noble/v4/x/forwarding/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion interchaintest/forwarding_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
"github.com/icza/dyno"
forwardingtypes "github.com/noble-assets/noble/v5/x/forwarding/types"
forwardingtypes "github.com/noble-assets/noble/v4/x/forwarding/types"
"github.com/strangelove-ventures/interchaintest/v4"
"github.com/strangelove-ventures/interchaintest/v4/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v4/ibc"
Expand Down
2 changes: 1 addition & 1 deletion proto/noble/forwarding/v1/account.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package noble.forwarding.v1;
import "cosmos/auth/v1beta1/auth.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/noble-assets/noble/v5/x/forwarding/types";
option go_package = "github.com/noble-assets/noble/v4/x/forwarding/types";

message ForwardingAccount {
cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true];
Expand Down
2 changes: 1 addition & 1 deletion proto/noble/forwarding/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package noble.forwarding.v1;

option go_package = "github.com/noble-assets/noble/v5/x/forwarding/types";
option go_package = "github.com/noble-assets/noble/v4/x/forwarding/types";

message GenesisState {
map<string, uint64> num_of_accounts = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/noble/forwarding/v1/packet.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package noble.forwarding.v1;

option go_package = "github.com/noble-assets/noble/v5/x/forwarding/types";
option go_package = "github.com/noble-assets/noble/v4/x/forwarding/types";

message RegisterAccountData {
string recipient = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/noble/forwarding/v1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/noble-assets/noble/v5/x/forwarding/types";
option go_package = "github.com/noble-assets/noble/v4/x/forwarding/types";

service Query {
rpc Address(QueryAddress) returns (QueryAddressResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/noble/forwarding/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package noble.forwarding.v1;

option go_package = "github.com/noble-assets/noble/v5/x/forwarding/types";
option go_package = "github.com/noble-assets/noble/v4/x/forwarding/types";

service Msg {
rpc RegisterAccount(noble.forwarding.v1.MsgRegisterAccount) returns (noble.forwarding.v1.MsgRegisterAccountResponse);
Expand Down
4 changes: 2 additions & 2 deletions x/forwarding/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/authz"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/noble-assets/noble/v5/x/forwarding/keeper"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/keeper"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

type Decorator struct {
Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/client/cli/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/client/cli/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions x/forwarding/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package forwarding

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/noble-assets/noble/v5/x/forwarding/keeper"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/keeper"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

func InitGenesis(ctx sdk.Context, k *keeper.Keeper, genesis types.GenesisState) {
Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/keeper/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
"github.com/tendermint/tendermint/libs/log"
)

Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

var _ types.MsgServer = &Keeper{}
Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/keeper/query_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

var _ types.QueryServer = &Keeper{}
Expand Down
2 changes: 1 addition & 1 deletion x/forwarding/keeper/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

// PERSISTENT STATE
Expand Down
4 changes: 2 additions & 2 deletions x/forwarding/middleware.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
channeltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
"github.com/cosmos/ibc-go/v4/modules/core/exported"
"github.com/noble-assets/noble/v5/x/forwarding/keeper"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/keeper"
"github.com/noble-assets/noble/v4/x/forwarding/types"
)

var _ porttypes.IBCModule = &Middleware{}
Expand Down
6 changes: 3 additions & 3 deletions x/forwarding/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/gorilla/mux"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/noble-assets/noble/v5/x/forwarding/client/cli"
"github.com/noble-assets/noble/v5/x/forwarding/keeper"
"github.com/noble-assets/noble/v5/x/forwarding/types"
"github.com/noble-assets/noble/v4/x/forwarding/client/cli"
"github.com/noble-assets/noble/v4/x/forwarding/keeper"
"github.com/noble-assets/noble/v4/x/forwarding/types"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
)
Expand Down
32 changes: 16 additions & 16 deletions x/forwarding/types/account.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions x/forwarding/types/genesis.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions x/forwarding/types/packet.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 31 additions & 31 deletions x/forwarding/types/query.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions x/forwarding/types/tx.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1735bd6

Please sign in to comment.