Skip to content

Commit

Permalink
chore: reorganize repo structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnletey
johnletey committed Oct 7, 2024
1 parent e7200be commit 2e33341
Show file tree
Hide file tree
Showing 56 changed files with 310 additions and 574 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ endif

test-unit:
@echo "🤖 Running unit tests..."
@go test -cover -coverprofile=coverage.out -race -v ./x/aura/keeper/...
@go test -cover -coverprofile=coverage.out -race -v ./keeper/...
@echo "✅ Completed unit tests!"

test-e2e:
Expand Down
32 changes: 16 additions & 16 deletions api/module/v1/module.pulsar.go
View file

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

262 changes: 0 additions & 262 deletions e2e/go.sum
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions e2e/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/gogo/protobuf/jsonpb"
_ "github.com/ondoprotocol/usdy-noble/v2/x/aura"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
"github.com/strangelove-ventures/interchaintest/v8"
"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v8/ibc"
Expand Down
6 changes: 3 additions & 3 deletions x/aura/genesis.go → genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package aura
import (
"cosmossdk.io/core/address"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
)

func InitGenesis(ctx sdk.Context, k *keeper.Keeper, addressCodec address.Codec, genesis types.GenesisState) {
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/keeper.go → keeper/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"cosmossdk.io/core/store"
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/types"
)

type Keeper struct {
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/keeper_test.go → keeper/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/msg_server.go → keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

sdkerrors "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/types"
)

var _ types.MsgServer = &msgServer{}
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/msg_server_blocklist.go → keeper/msg_server_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"cosmossdk.io/errors"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
)

var _ blocklist.MsgServer = &blocklistMsgServer{}
Expand Down
4 changes: 2 additions & 2 deletions x/aura/keeper/msg_server_blocklist_test.go → keeper/msg_server_blocklist_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package keeper_test
import (
"testing"

"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions x/aura/keeper/msg_server_test.go → keeper/msg_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/query_server.go → keeper/query_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/types"
)

var _ types.QueryServer = &queryServer{}
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/query_server_blocklist.go → keeper/query_server_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
errorstypes "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
)

var _ blocklist.QueryServer = &blocklistQueryServer{}
Expand Down
4 changes: 2 additions & 2 deletions x/aura/keeper/query_server_blocklist_test.go → keeper/query_server_blocklist_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"testing"

"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions x/aura/keeper/query_server_test.go → keeper/query_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"testing"

"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/utils"
"github.com/ondoprotocol/usdy-noble/v2/utils/mocks"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/state.go → keeper/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"cosmossdk.io/math"
"cosmossdk.io/store/prefix"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/types"
)

//
Expand Down
2 changes: 1 addition & 1 deletion x/aura/keeper/state_blocklist.go → keeper/state_blocklist.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"cosmossdk.io/store/prefix"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
)

//
Expand Down
0 x/aura/keeper/state_blocklist_test.go → keeper/state_blocklist_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions x/aura/module.go → module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
blocklistv1 "github.com/ondoprotocol/usdy-noble/v2/api/blocklist/v1"
modulev1 "github.com/ondoprotocol/usdy-noble/v2/api/module/v1"
aurav1 "github.com/ondoprotocol/usdy-noble/v2/api/v1"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types"
"github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist"
"github.com/ondoprotocol/usdy-noble/v2/keeper"
"github.com/ondoprotocol/usdy-noble/v2/types"
"github.com/ondoprotocol/usdy-noble/v2/types/blocklist"
)

// ConsensusVersion defines the current x/aura module consensus version.
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/events.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package aura.blocklist.v1;

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types/blocklist";

// OwnershipTransferStarted is emitted whenever an ownership transfer is started.
message OwnershipTransferStarted {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package aura.blocklist.v1;

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types/blocklist";

message GenesisState {
// owner is the address that can control this submodule.
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
import "cosmos/query/v1/query.proto";
import "google/api/annotations.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types/blocklist";

service Query {
rpc Owner(QueryOwner) returns (QueryOwnerResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/blocklist/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types/blocklist";

service Msg {
option (cosmos.msg.v1.service) = true;
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/module/v1/module.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "cosmos/app/v1alpha1/module.proto";

// Module is the config object of the Aura module.
message Module {
option (cosmos.app.v1alpha1.module) = {go_import: "github.com/ondoprotocol/usdy-noble/v2/x/aura"};
option (cosmos.app.v1alpha1.module) = {go_import: "github.com/ondoprotocol/usdy-noble/v2"};

// denom is the denom this module is allowed to govern, burn, mint, etc.
string denom = 1;
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/events.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import "amino/amino.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types";

// Paused is emitted whenever the module is paused.
message Paused {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "aura/blocklist/v1/genesis.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types";

message GenesisState {
// blocklist_state is the genesis state of the blocklist submodule.
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/query/v1/query.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types";

service Query {
rpc Denom(aura.v1.QueryDenom) returns (aura.v1.QueryDenomResponse) {
Expand Down
2 changes: 1 addition & 1 deletion proto/aura/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/ondoprotocol/usdy-noble/v2/x/aura/types";
option go_package = "github.com/ondoprotocol/usdy-noble/v2/types";

service Msg {
option (cosmos.msg.v1.service) = true;
Expand Down
4 changes: 2 additions & 2 deletions simapp/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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/ondoprotocol/usdy-noble/v2/x/aura"
_ "github.com/ondoprotocol/usdy-noble/v2"

// Cosmos Modules
upgradekeeper "cosmossdk.io/x/upgrade/keeper"
Expand All @@ -43,7 +43,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
aurakeeper "github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper"
aurakeeper "github.com/ondoprotocol/usdy-noble/v2/keeper"
)

var DefaultNodeHome string
Expand Down
0 x/aura/spec/01_state.md → spec/01_state.md
View file
File renamed without changes.
0 x/aura/spec/01_state_blocklist.md → spec/01_state_blocklist.md
View file
File renamed without changes.
0 x/aura/spec/02_messages.md → spec/02_messages.md
View file
File renamed without changes.
0 x/aura/spec/02_messages_blocklist.md → spec/02_messages_blocklist.md
View file
File renamed without changes.
0 x/aura/spec/03_events.md → spec/03_events.md
View file
File renamed without changes.
0 x/aura/spec/03_events_blocklist.md → spec/03_events_blocklist.md
View file
File renamed without changes.
0 x/aura/types/blocklist/codec.go → types/blocklist/codec.go
View file
File renamed without changes.
0 x/aura/types/blocklist/errors.go → types/blocklist/errors.go
View file
File renamed without changes.
38 changes: 19 additions & 19 deletions x/aura/types/blocklist/events.pb.go → types/blocklist/events.pb.go
View file

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

0 x/aura/types/blocklist/genesis.go → types/blocklist/genesis.go
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions x/aura/types/blocklist/genesis.pb.go → types/blocklist/genesis.pb.go
View file

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

0 x/aura/types/blocklist/keys.go → types/blocklist/keys.go
View file
File renamed without changes.
Loading

0 comments on commit 2e33341

Please sign in to comment.