Merge pull request #137 from e-money/136-inflation

136 Stop using internal package
e-money · Sep 21, 2021 · e8c9f57 · e8c9f57
2 parents 5fc1176 + 77e5bac
commit e8c9f57
Show file tree

Hide file tree

Showing 33 changed files with 159 additions and 110 deletions.
diff --git a/proto/em/inflation/v1/genesis.proto b/proto/em/inflation/v1/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "em/inflation/v1/inflation.proto";
 
-option go_package = "github.com/e-money/em-ledger/x/inflation/internal/types";
+option go_package = "github.com/e-money/em-ledger/x/inflation/types";
 
 message GenesisState {
   // todo (reviewer): yaml naming is a bit inconsistent. state contains assets

diff --git a/proto/em/inflation/v1/inflation.proto b/proto/em/inflation/v1/inflation.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/e-money/em-ledger/x/inflation/internal/types";
+option go_package = "github.com/e-money/em-ledger/x/inflation/types";
 
 message InflationAsset {
   string denom = 1 [ (gogoproto.moretags) = "yaml:\"denom\"" ];

diff --git a/proto/em/inflation/v1/query.proto b/proto/em/inflation/v1/query.proto
@@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "google/api/annotations.proto";
 import "em/inflation/v1/inflation.proto";
 
-option go_package = "github.com/e-money/em-ledger/x/inflation/internal/types";
+option go_package = "github.com/e-money/em-ledger/x/inflation/types";
 
 service Query {
   rpc Inflation(QueryInflationRequest) returns (QueryInflationResponse) {

diff --git a/x/authority/types/query.pb.gw.go b/x/authority/types/query.pb.gw.go
diff --git a/x/buyback/internal/types/query.pb.gw.go b/x/buyback/internal/types/query.pb.gw.go
diff --git a/x/inflation/accrual.go b/x/inflation/accrual.go
@@ -7,11 +7,9 @@ package inflation
 import (
 	"time"
 
-	"github.com/e-money/em-ledger/util"
-
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/e-money/em-ledger/util"
+	"github.com/e-money/em-ledger/x/inflation/types"
 )
 
 const (

diff --git a/x/inflation/alias.go b/x/inflation/alias.go
@@ -10,8 +10,8 @@
 package inflation
 
 import (
-	"github.com/e-money/em-ledger/x/inflation/internal/keeper"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/keeper"
+	"github.com/e-money/em-ledger/x/inflation/types"
 )
 
 const (

diff --git a/x/inflation/client/cli/query.go b/x/inflation/client/cli/query.go
@@ -7,9 +7,7 @@ package cli
 import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
-
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/x/inflation/client/rest/query.go b/x/inflation/client/rest/query.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/types/rest"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"net/http"
 )
 

diff --git a/x/inflation/genesis.go b/x/inflation/genesis.go
@@ -6,7 +6,7 @@ package inflation
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/types"
 )
 
 // NewGenesisState creates a new GenesisState object

diff --git a/x/inflation/internal/keeper/grpc_query.go → x/inflation/keeper/grpc_query.go b/x/inflation/internal/keeper/grpc_query.go → x/inflation/keeper/grpc_query.go
@@ -2,8 +2,9 @@ package keeper
 
 import (
 	"context"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/...lation/internal/keeper/grpc_query_test.go → x/inflation/keeper/grpc_query_test.go b/...lation/internal/keeper/grpc_query_test.go → x/inflation/keeper/grpc_query_test.go
@@ -1,13 +1,14 @@
 package keeper
 
 import (
+	"testing"
+	"time"
+
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
-	"time"
 )
 
 func TestQueryInflation(t *testing.T) {

diff --git a/x/inflation/internal/keeper/keeper.go → x/inflation/keeper/keeper.go b/x/inflation/internal/keeper/keeper.go → x/inflation/keeper/keeper.go
@@ -6,12 +6,12 @@ package keeper
 
 import (
 	"fmt"
-	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/e-money/em-ledger/x/inflation/types"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 type Keeper struct {

diff --git a/x/inflation/internal/keeper/querier.go → x/inflation/keeper/querier.go b/x/inflation/internal/keeper/querier.go → x/inflation/keeper/querier.go
@@ -6,12 +6,10 @@ package keeper
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-
+	"github.com/e-money/em-ledger/x/inflation/types"
 	abci "github.com/tendermint/tendermint/abci/types"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
 )
 
 // NewQuerier returns an inflation Querier handler.

diff --git a/x/inflation/internal/keeper/querier_test.go → x/inflation/keeper/querier_test.go b/x/inflation/internal/keeper/querier_test.go → x/inflation/keeper/querier_test.go
@@ -7,9 +7,8 @@ package keeper
 import (
 	"testing"
 
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/stretchr/testify/require"
-
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 )
 

diff --git a/x/inflation/internal/keeper/test_common.go → x/inflation/keeper/test_common.go b/x/inflation/internal/keeper/test_common.go → x/inflation/keeper/test_common.go
@@ -6,6 +6,9 @@
 package keeper
 
 import (
+	"testing"
+	"time"
+
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
@@ -22,13 +25,11 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	dbm "github.com/tendermint/tm-db"
-	"testing"
-	"time"
 )
 
 type testInput struct {

diff --git a/x/inflation/module.go b/x/inflation/module.go
@@ -8,15 +8,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/e-money/em-ledger/x/inflation/client/cli"
 	"github.com/e-money/em-ledger/x/inflation/client/rest"
-	"github.com/e-money/em-ledger/x/inflation/internal/keeper"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/keeper"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/gorilla/mux"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"

diff --git a/x/inflation/state_test.go b/x/inflation/state_test.go
@@ -24,8 +24,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/e-money/em-ledger/x/inflation/internal/keeper"
-	"github.com/e-money/em-ledger/x/inflation/internal/types"
+	"github.com/e-money/em-ledger/x/inflation/keeper"
+	"github.com/e-money/em-ledger/x/inflation/types"
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

diff --git a/x/inflation/internal/types/codec.go → x/inflation/types/codec.go b/x/inflation/internal/types/codec.go → x/inflation/types/codec.go
diff --git a/x/inflation/internal/types/errors.go → x/inflation/types/errors.go b/x/inflation/internal/types/errors.go → x/inflation/types/errors.go
diff --git a/x/inflation/internal/types/events.go → x/inflation/types/events.go b/x/inflation/internal/types/events.go → x/inflation/types/events.go
diff --git a/...lation/internal/types/expected_keepers.go → x/inflation/types/expected_keepers.go b/...lation/internal/types/expected_keepers.go → x/inflation/types/expected_keepers.go
diff --git a/x/inflation/internal/types/genesis.pb.go → x/inflation/types/genesis.pb.go b/x/inflation/internal/types/genesis.pb.go → x/inflation/types/genesis.pb.go