chore: reorganize repo structure (#19)

noble-assets · Oct 30, 2024 · 4f8f569 · 4f8f569
1 parent 93780a9
commit 4f8f569
Show file tree

Hide file tree

Showing 54 changed files with 210 additions and 209 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ build:
 	@echo "✅ Completed build!"
 
 ###############################################################################
-###                          Formatting & Linting                           ###
+###                                 Tooling                                 ###
 ###############################################################################
 
 gofumpt_cmd=mvdan.cc/gofumpt
@@ -60,7 +60,7 @@ proto-lint:
 
 local-image:
 	@echo "🤖 Building image..."
-	@heighliner build --chain noble-forwarding-simd --file ./chains.yaml --local 1> /dev/null
+	@heighliner build --chain noble-forwarding-simd --file e2e/chains.yaml --local 1> /dev/null
 	@echo "✅ Completed build!"
 
 test: test-e2e

diff --git a/x/forwarding/ante.go → ante.go b/x/forwarding/ante.go → ante.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 // SigVerificationGasConsumer is a wrapper around the default provided by the

diff --git a/...ble/forwarding/module/v1/module.pulsar.go → api/module/v1/module.pulsar.go b/...ble/forwarding/module/v1/module.pulsar.go → api/module/v1/module.pulsar.go
diff --git a/api/noble/forwarding/v1/account.pulsar.go → api/v1/account.pulsar.go b/api/noble/forwarding/v1/account.pulsar.go → api/v1/account.pulsar.go
diff --git a/api/noble/forwarding/v1/events.pulsar.go → api/v1/events.pulsar.go b/api/noble/forwarding/v1/events.pulsar.go → api/v1/events.pulsar.go
diff --git a/api/noble/forwarding/v1/genesis.pulsar.go → api/v1/genesis.pulsar.go b/api/noble/forwarding/v1/genesis.pulsar.go → api/v1/genesis.pulsar.go
diff --git a/api/noble/forwarding/v1/packet.pulsar.go → api/v1/packet.pulsar.go b/api/noble/forwarding/v1/packet.pulsar.go → api/v1/packet.pulsar.go
diff --git a/api/noble/forwarding/v1/query.pulsar.go → api/v1/query.pulsar.go b/api/noble/forwarding/v1/query.pulsar.go → api/v1/query.pulsar.go
diff --git a/api/noble/forwarding/v1/query_grpc.pb.go → api/v1/query_grpc.pb.go b/api/noble/forwarding/v1/query_grpc.pb.go → api/v1/query_grpc.pb.go
diff --git a/api/noble/forwarding/v1/tx.pulsar.go → api/v1/tx.pulsar.go b/api/noble/forwarding/v1/tx.pulsar.go → api/v1/tx.pulsar.go
diff --git a/api/noble/forwarding/v1/tx_grpc.pb.go → api/v1/tx_grpc.pb.go b/api/noble/forwarding/v1/tx_grpc.pb.go → api/v1/tx_grpc.pb.go
diff --git a/x/forwarding/client/cli/query.go → client/cli/query.go b/x/forwarding/client/cli/query.go → client/cli/query.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/gogoproto/proto"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/x/forwarding/client/cli/tx.go → client/cli/tx.go b/x/forwarding/client/cli/tx.go → client/cli/tx.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/chains.yaml → e2e/chains.yaml b/chains.yaml → e2e/chains.yaml
diff --git a/e2e/forwarding_test.go b/e2e/forwarding_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/gogoproto/jsonpb"
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	"github.com/icza/dyno"
-	forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	forwardingtypes "github.com/noble-assets/forwarding/v2/types"
 	"github.com/strangelove-ventures/interchaintest/v8"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"

diff --git a/x/forwarding/genesis.go → genesis.go b/x/forwarding/genesis.go → genesis.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/keeper"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 func InitGenesis(ctx context.Context, k *keeper.Keeper, genesis types.GenesisState) {

diff --git a/x/forwarding/keeper/keeper.go → keeper/keeper.go b/x/forwarding/keeper/keeper.go → keeper/keeper.go
@@ -15,7 +15,7 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 type Keeper struct {

diff --git a/x/forwarding/keeper/migrations.go → keeper/migrations.go b/x/forwarding/keeper/migrations.go → keeper/migrations.go
@@ -3,7 +3,7 @@ package keeper
 import (
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	v1 "github.com/noble-assets/forwarding/v2/x/forwarding/migrations/v1"
+	v1 "github.com/noble-assets/forwarding/v2/migrations/v1"
 )
 
 // Migrator is a struct for handling in-place store migrations.

diff --git a/x/forwarding/keeper/msg_server.go → keeper/msg_server.go b/x/forwarding/keeper/msg_server.go → keeper/msg_server.go
@@ -10,7 +10,7 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 var _ types.MsgServer = &Keeper{}

diff --git a/x/forwarding/keeper/query_server.go → keeper/query_server.go b/x/forwarding/keeper/query_server.go → keeper/query_server.go
@@ -7,7 +7,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	errorstypes "github.com/cosmos/cosmos-sdk/types/errors"
 	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 var _ types.QueryServer = &Keeper{}

diff --git a/x/forwarding/keeper/state.go → keeper/state.go b/x/forwarding/keeper/state.go → keeper/state.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 // PERSISTENT STATE

diff --git a/x/forwarding/middleware.go → middleware.go b/x/forwarding/middleware.go → middleware.go
@@ -8,8 +8,8 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v8/modules/core/exported"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/keeper"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 var _ porttypes.IBCModule = &Middleware{}

diff --git a/x/forwarding/migrations/v1/state.go → migrations/v1/state.go b/x/forwarding/migrations/v1/state.go → migrations/v1/state.go
@@ -5,7 +5,7 @@ import (
 
 	"cosmossdk.io/store/prefix"
 	storetypes "cosmossdk.io/store/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2/types"
 )
 
 // GetAllNumOfAccounts implements adapted legacy store logic from version 1.

diff --git a/x/forwarding/module.go → module.go b/x/forwarding/module.go → module.go
@@ -21,15 +21,15 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
-	modulev1 "github.com/noble-assets/forwarding/v2/api/noble/forwarding/module/v1"
-	forwardingv1 "github.com/noble-assets/forwarding/v2/api/noble/forwarding/v1"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/client/cli"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
-	"github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	modulev1 "github.com/noble-assets/forwarding/v2/api/module/v1"
+	forwardingv1 "github.com/noble-assets/forwarding/v2/api/v1"
+	"github.com/noble-assets/forwarding/v2/client/cli"
+	"github.com/noble-assets/forwarding/v2/keeper"
+	"github.com/noble-assets/forwarding/v2/types"
 	"github.com/spf13/cobra"
 )
 
-// ConsensusVersion defines the current x/forwarding module consensus version.
+// ConsensusVersion defines the current Forwarding module consensus version.
 const ConsensusVersion = 2
 
 var (
@@ -122,7 +122,7 @@ func (m AppModule) RegisterServices(cfg module.Configurator) {
 
 	migrator := keeper.NewMigrator(m.keeper)
 	if err := cfg.RegisterMigration(types.ModuleName, 1, migrator.Migrate1to2); err != nil {
-		panic(fmt.Sprintf("failed to migrate x/forwarding from version 1 to 2: %v", err))
+		panic(fmt.Sprintf("failed to migrate Forwarding from version 1 to 2: %v", err))
 	}
 }
 
@@ -242,7 +242,7 @@ type ModuleOutputs struct {
 
 func ProvideModule(in ModuleInputs) ModuleOutputs {
 	if in.Config.Authority == "" {
-		panic("authority for x/forwarding module must be set")
+		panic("authority for Forwarding module must be set")
 	}
 
 	authority := authtypes.NewModuleAddressOrBech32Address(in.Config.Authority)

diff --git a/proto/generate.sh b/proto/generate.sh
@@ -4,5 +4,8 @@ buf generate --template buf.gen.pulsar.yaml
 cd ..
 
 cp -r github.com/noble-assets/forwarding/v2/* ./
+cp -r api/noble/forwarding/* api/
+
 rm -rf github.com
+rm -rf api/noble
 rm -rf noble
diff --git a/proto/noble/forwarding/module/v1/module.proto b/proto/noble/forwarding/module/v1/module.proto
@@ -6,7 +6,7 @@ import "cosmos/app/v1alpha1/module.proto";
 
 // Module is the config object of the Forwarding module.
 message Module {
-  option (cosmos.app.v1alpha1.module) = {go_import: "github.com/noble-assets/forwarding/v2/x/forwarding"};
+  option (cosmos.app.v1alpha1.module) = {go_import: "github.com/noble-assets/forwarding/v2"};
 
   // authority defines the custom module authority.
   string authority = 1;

diff --git a/proto/noble/forwarding/v1/account.proto b/proto/noble/forwarding/v1/account.proto
@@ -6,7 +6,7 @@ import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 message ForwardingAccount {
   option (cosmos_proto.implements_interface) = "cosmos.auth.v1beta1.AccountI";

diff --git a/proto/noble/forwarding/v1/events.proto b/proto/noble/forwarding/v1/events.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package noble.forwarding.v1;
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 // AccountRegistered is emitted whenever a new forwarding account is registered.
 message AccountRegistered {

diff --git a/proto/noble/forwarding/v1/genesis.proto b/proto/noble/forwarding/v1/genesis.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package noble.forwarding.v1;
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 message GenesisState {
   repeated string allowed_denoms = 1;

diff --git a/proto/noble/forwarding/v1/packet.proto b/proto/noble/forwarding/v1/packet.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package noble.forwarding.v1;
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 message RegisterAccountData {
   string recipient = 1;

diff --git a/proto/noble/forwarding/v1/query.proto b/proto/noble/forwarding/v1/query.proto
@@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 service Query {
   rpc Denoms(QueryDenoms) returns (QueryDenomsResponse) {

diff --git a/proto/noble/forwarding/v1/tx.proto b/proto/noble/forwarding/v1/tx.proto
@@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types";
+option go_package = "github.com/noble-assets/forwarding/v2/types";
 
 service Msg {
   option (cosmos.msg.v1.service) = true;

diff --git a/simapp/ante.go b/simapp/ante.go
@@ -6,8 +6,8 @@ import (
 	errorstypes "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	"github.com/noble-assets/forwarding/v2/x/forwarding"
-	forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types"
+	"github.com/noble-assets/forwarding/v2"
+	forwardingtypes "github.com/noble-assets/forwarding/v2/types"
 )
 
 type BankKeeper interface {

diff --git a/simapp/app.go b/simapp/app.go
@@ -27,7 +27,7 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/x/consensus"
 	_ "github.com/cosmos/cosmos-sdk/x/params"
 	_ "github.com/cosmos/cosmos-sdk/x/staking"
-	"github.com/noble-assets/forwarding/v2/x/forwarding"
+	"github.com/noble-assets/forwarding/v2"
 
 	// Cosmos Modules
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
@@ -44,7 +44,7 @@ import (
 	transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	// Custom Modules
-	forwardingkeeper "github.com/noble-assets/forwarding/v2/x/forwarding/keeper"
+	forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
 )
 
 var DefaultNodeHome string

diff --git a/simapp/legacy.go b/simapp/legacy.go
@@ -15,7 +15,7 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	"github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
-	"github.com/noble-assets/forwarding/v2/x/forwarding"
+	"github.com/noble-assets/forwarding/v2"
 )
 
 func (app *SimApp) RegisterLegacyModules() error {

diff --git a/x/forwarding/spec/01-state.md → spec/01-state.md b/x/forwarding/spec/01-state.md → spec/01-state.md
diff --git a/x/forwarding/spec/02-messages.md → spec/02-messages.md b/x/forwarding/spec/02-messages.md → spec/02-messages.md
diff --git a/x/forwarding/spec/03-events.md → spec/03-events.md b/x/forwarding/spec/03-events.md → spec/03-events.md
diff --git a/x/forwarding/spec/04-queries.md → spec/04-queries.md b/x/forwarding/spec/04-queries.md → spec/04-queries.md
diff --git a/x/forwarding/spec/05-cli.md → spec/05-cli.md b/x/forwarding/spec/05-cli.md → spec/05-cli.md
diff --git a/x/forwarding/types/account.go → types/account.go b/x/forwarding/types/account.go → types/account.go
diff --git a/x/forwarding/types/account.pb.go → types/account.pb.go b/x/forwarding/types/account.pb.go → types/account.pb.go
diff --git a/x/forwarding/types/channel.go → types/channel.go b/x/forwarding/types/channel.go → types/channel.go
diff --git a/x/forwarding/types/codec.go → types/codec.go b/x/forwarding/types/codec.go → types/codec.go
diff --git a/x/forwarding/types/errors.go → types/errors.go b/x/forwarding/types/errors.go → types/errors.go