diff --git a/x/crisis/alias.go b/x/crisis/alias.go index 1b05371f3..8e831527d 100644 --- a/x/crisis/alias.go +++ b/x/crisis/alias.go @@ -3,8 +3,8 @@ package crisis // nolint import ( - "github.com/cosmos/cosmos-sdk/x/crisis/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/keeper" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) const ( diff --git a/x/crisis/client/cli/tx.go b/x/crisis/client/cli/tx.go index d54153b8f..47c421a0d 100644 --- a/x/crisis/client/cli/tx.go +++ b/x/crisis/client/cli/tx.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authclient "github.com/cosmos/cosmos-sdk/x/auth/client" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) // command to replace a delegator's withdrawal address diff --git a/x/crisis/genesis.go b/x/crisis/genesis.go index dede2ab89..4d9ea3568 100644 --- a/x/crisis/genesis.go +++ b/x/crisis/genesis.go @@ -2,8 +2,8 @@ package crisis import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/keeper" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) // new crisis genesis diff --git a/x/crisis/handler.go b/x/crisis/handler.go index c7e58b686..cd94db85a 100644 --- a/x/crisis/handler.go +++ b/x/crisis/handler.go @@ -3,8 +3,8 @@ package crisis import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/keeper" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) // RouterKey diff --git a/x/crisis/internal/keeper/integration_test.go b/x/crisis/keeper/integration_test.go similarity index 100% rename from x/crisis/internal/keeper/integration_test.go rename to x/crisis/keeper/integration_test.go diff --git a/x/crisis/internal/keeper/keeper.go b/x/crisis/keeper/keeper.go similarity index 98% rename from x/crisis/internal/keeper/keeper.go rename to x/crisis/keeper/keeper.go index d57030ed6..1a29064dd 100644 --- a/x/crisis/internal/keeper/keeper.go +++ b/x/crisis/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/crisis/internal/keeper/keeper_test.go b/x/crisis/keeper/keeper_test.go similarity index 100% rename from x/crisis/internal/keeper/keeper_test.go rename to x/crisis/keeper/keeper_test.go diff --git a/x/crisis/internal/keeper/params.go b/x/crisis/keeper/params.go similarity index 89% rename from x/crisis/internal/keeper/params.go rename to x/crisis/keeper/params.go index cdf7169af..d44efa4eb 100644 --- a/x/crisis/internal/keeper/params.go +++ b/x/crisis/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) // GetConstantFee get's the constant fee from the paramSpace diff --git a/x/crisis/module.go b/x/crisis/module.go index dd7ae3677..93d30ee36 100644 --- a/x/crisis/module.go +++ b/x/crisis/module.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/crisis/client/cli" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/crisis/internal/types" + "github.com/cosmos/cosmos-sdk/x/crisis/keeper" + "github.com/cosmos/cosmos-sdk/x/crisis/types" ) var ( diff --git a/x/crisis/internal/types/codec.go b/x/crisis/types/codec.go similarity index 100% rename from x/crisis/internal/types/codec.go rename to x/crisis/types/codec.go diff --git a/x/crisis/internal/types/errors.go b/x/crisis/types/errors.go similarity index 100% rename from x/crisis/internal/types/errors.go rename to x/crisis/types/errors.go diff --git a/x/crisis/internal/types/events.go b/x/crisis/types/events.go similarity index 100% rename from x/crisis/internal/types/events.go rename to x/crisis/types/events.go diff --git a/x/crisis/internal/types/expected_keepers.go b/x/crisis/types/expected_keepers.go similarity index 100% rename from x/crisis/internal/types/expected_keepers.go rename to x/crisis/types/expected_keepers.go diff --git a/x/crisis/internal/types/genesis.go b/x/crisis/types/genesis.go similarity index 100% rename from x/crisis/internal/types/genesis.go rename to x/crisis/types/genesis.go diff --git a/x/crisis/internal/types/keys.go b/x/crisis/types/keys.go similarity index 100% rename from x/crisis/internal/types/keys.go rename to x/crisis/types/keys.go diff --git a/x/crisis/internal/types/msgs.go b/x/crisis/types/msgs.go similarity index 100% rename from x/crisis/internal/types/msgs.go rename to x/crisis/types/msgs.go diff --git a/x/crisis/internal/types/params.go b/x/crisis/types/params.go similarity index 100% rename from x/crisis/internal/types/params.go rename to x/crisis/types/params.go diff --git a/x/crisis/internal/types/route.go b/x/crisis/types/route.go similarity index 100% rename from x/crisis/internal/types/route.go rename to x/crisis/types/route.go diff --git a/x/crisis/internal/types/types.pb.go b/x/crisis/types/types.pb.go similarity index 83% rename from x/crisis/internal/types/types.pb.go rename to x/crisis/types/types.pb.go index 6e9507e1a..c98ec52df 100644 --- a/x/crisis/internal/types/types.pb.go +++ b/x/crisis/types/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: x/crisis/internal/types/types.proto +// source: x/crisis/types/types.proto package types @@ -36,7 +36,7 @@ func (m *MsgVerifyInvariant) Reset() { *m = MsgVerifyInvariant{} } func (m *MsgVerifyInvariant) String() string { return proto.CompactTextString(m) } func (*MsgVerifyInvariant) ProtoMessage() {} func (*MsgVerifyInvariant) Descriptor() ([]byte, []int) { - return fileDescriptor_df1c0b8e580cce76, []int{0} + return fileDescriptor_d15f5abb7502dad7, []int{0} } func (m *MsgVerifyInvariant) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,32 +90,29 @@ func init() { proto.RegisterType((*MsgVerifyInvariant)(nil), "cosmos_sdk.x.crisis.v1.MsgVerifyInvariant") } -func init() { - proto.RegisterFile("x/crisis/internal/types/types.proto", fileDescriptor_df1c0b8e580cce76) -} +func init() { proto.RegisterFile("x/crisis/types/types.proto", fileDescriptor_d15f5abb7502dad7) } -var fileDescriptor_df1c0b8e580cce76 = []byte{ - // 308 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xae, 0xd0, 0x4f, 0x2e, - 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0xca, 0x4b, 0xcc, 0xd1, 0x2f, 0xa9, - 0x2c, 0x48, 0x2d, 0x86, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x62, 0xc9, 0xf9, 0xc5, - 0xb9, 0xf9, 0xc5, 0xf1, 0xc5, 0x29, 0xd9, 0x7a, 0x15, 0x7a, 0x10, 0xf5, 0x7a, 0x65, 0x86, 0x52, - 0x6a, 0x25, 0x19, 0x99, 0x45, 0x29, 0xf1, 0x05, 0x89, 0x45, 0x25, 0x95, 0xfa, 0x60, 0xa5, 0xfa, - 0xe9, 0xf9, 0xe9, 0xf9, 0x08, 0x16, 0x44, 0xbf, 0x52, 0x03, 0x13, 0x97, 0x90, 0x6f, 0x71, 0x7a, - 0x58, 0x6a, 0x51, 0x66, 0x5a, 0xa5, 0x67, 0x5e, 0x59, 0x62, 0x51, 0x66, 0x62, 0x5e, 0x89, 0x90, - 0x27, 0x17, 0x5b, 0x71, 0x6a, 0x5e, 0x4a, 0x6a, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x93, - 0xe1, 0xaf, 0x7b, 0xf2, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, - 0x10, 0x5b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0x36, 0xd4, 0x51, 0x8e, 0xc9, 0xc9, 0x8e, 0x29, 0x29, - 0x45, 0xa9, 0xc5, 0xc5, 0x41, 0x50, 0x03, 0x84, 0x42, 0xb8, 0x44, 0x33, 0x61, 0xe6, 0xc6, 0xe7, - 0xe6, 0xa7, 0x94, 0xe6, 0xa4, 0xc6, 0xe7, 0x25, 0xe6, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x70, - 0x3a, 0x29, 0x7c, 0xba, 0x27, 0x2f, 0x53, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x55, 0x99, 0x52, - 0x90, 0x30, 0x5c, 0xdc, 0x17, 0x2c, 0xec, 0x97, 0x98, 0x9b, 0x2a, 0xe4, 0xcc, 0xc5, 0x8f, 0x50, - 0x5e, 0x94, 0x5f, 0x5a, 0x92, 0x2a, 0xc1, 0x0c, 0x36, 0x4f, 0xea, 0xd3, 0x3d, 0x79, 0x31, 0x74, - 0xf3, 0xc0, 0x0a, 0x94, 0x82, 0xf8, 0xe0, 0x22, 0x41, 0x20, 0x01, 0x2b, 0x96, 0x17, 0x0b, 0xe4, - 0x19, 0x9d, 0xe4, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, - 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x8a, 0x15, 0xec, - 0xa9, 0x24, 0x36, 0x70, 0x50, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x46, 0x5c, 0xba, 0xa4, - 0x91, 0x01, 0x00, 0x00, +var fileDescriptor_d15f5abb7502dad7 = []byte{ + // 301 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xaa, 0xd0, 0x4f, 0x2e, + 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x85, 0x92, 0x7a, 0x05, 0x45, 0xf9, 0x25, + 0xf9, 0x42, 0x62, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0xf1, 0xc5, 0x29, 0xd9, 0x7a, 0x15, 0x7a, + 0x10, 0x65, 0x7a, 0x65, 0x86, 0x52, 0x6a, 0x25, 0x19, 0x99, 0x45, 0x29, 0xf1, 0x05, 0x89, 0x45, + 0x25, 0x95, 0xfa, 0x60, 0xa5, 0xfa, 0xe9, 0xf9, 0xe9, 0xf9, 0x08, 0x16, 0x44, 0xbf, 0x52, 0x03, + 0x13, 0x97, 0x90, 0x6f, 0x71, 0x7a, 0x58, 0x6a, 0x51, 0x66, 0x5a, 0xa5, 0x67, 0x5e, 0x59, 0x62, + 0x51, 0x66, 0x62, 0x5e, 0x89, 0x90, 0x27, 0x17, 0x5b, 0x71, 0x6a, 0x5e, 0x4a, 0x6a, 0x91, 0x04, + 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x93, 0xe1, 0xaf, 0x7b, 0xf2, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, + 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x10, 0x5b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0x36, 0xd4, 0x51, + 0x8e, 0xc9, 0xc9, 0x8e, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0x41, 0x50, 0x03, 0x84, 0x42, 0xb8, + 0x44, 0x33, 0x61, 0xe6, 0xc6, 0xe7, 0xe6, 0xa7, 0x94, 0xe6, 0xa4, 0xc6, 0xe7, 0x25, 0xe6, 0xa6, + 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x3a, 0x29, 0x7c, 0xba, 0x27, 0x2f, 0x53, 0x99, 0x98, 0x9b, + 0x63, 0xa5, 0x84, 0x55, 0x99, 0x52, 0x90, 0x30, 0x5c, 0xdc, 0x17, 0x2c, 0xec, 0x97, 0x98, 0x9b, + 0x2a, 0xe4, 0xcc, 0xc5, 0x8f, 0x50, 0x5e, 0x94, 0x5f, 0x5a, 0x92, 0x2a, 0xc1, 0x0c, 0x36, 0x4f, + 0xea, 0xd3, 0x3d, 0x79, 0x31, 0x74, 0xf3, 0xc0, 0x0a, 0x94, 0x82, 0xf8, 0xe0, 0x22, 0x41, 0x20, + 0x01, 0x2b, 0x96, 0x17, 0x0b, 0xe4, 0x19, 0x9d, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, + 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, + 0x58, 0x8e, 0x21, 0x4a, 0x1b, 0xaf, 0x8f, 0x51, 0x63, 0x25, 0x89, 0x0d, 0x1c, 0xa0, 0xc6, 0x80, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x65, 0xef, 0x2c, 0xae, 0x01, 0x00, 0x00, } func (this *MsgVerifyInvariant) Equal(that interface{}) bool { diff --git a/x/crisis/internal/types/types.proto b/x/crisis/types/types.proto similarity index 88% rename from x/crisis/internal/types/types.proto rename to x/crisis/types/types.proto index c691035f9..8298aa0b0 100644 --- a/x/crisis/internal/types/types.proto +++ b/x/crisis/types/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package cosmos_sdk.x.crisis.v1; -option go_package = "types"; +option go_package = "github.com/cosmos/cosmos-sdk/x/crisis/types"; import "third_party/proto/gogoproto/gogo.proto";