Skip to content

Commit

Permalink
fix: remove unused proto import
Browse files Browse the repository at this point in the history
  • Loading branch information
bdeneux committed Apr 7, 2023
1 parent a411b01 commit 824c912
Show file tree
Hide file tree
Showing 12 changed files with 225 additions and 210 deletions.
12 changes: 9 additions & 3 deletions proto/mint/v1beta1/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@ syntax = "proto3";

package mint.v1beta1;

import "gogoproto/gogo.proto";
import "amino/amino.proto";
import "gogoproto/gogo.proto";
import "mint/v1beta1/mint.proto";

option go_package = "github.com/okp4/okp4d/x/mint/types";

// GenesisState defines the mint module's genesis state.
message GenesisState {
// minter is a space for holding current inflation information.
Minter minter = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
Minter minter = 1 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];

// params defines all the parameters of the module.
Params params = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
Params params = 2 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}
8 changes: 4 additions & 4 deletions proto/mint/v1beta1/mint.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ syntax = "proto3";

package mint.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";

option go_package = "github.com/okp4/okp4d/x/mint/types";

Expand All @@ -16,13 +16,13 @@ option go_package = "github.com/okp4/okp4d/x/mint/types";
message Minter {
// current annual inflation rate
string inflation = 1 [
(cosmos_proto.scalar) = "cosmos.Dec",
(cosmos_proto.scalar) = "cosmos.Dec",
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false
];
// current annual expected provisions
string annual_provisions = 2 [
(cosmos_proto.scalar) = "cosmos.Dec",
(cosmos_proto.scalar) = "cosmos.Dec",
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false
];
Expand All @@ -46,7 +46,7 @@ message Params {
string mint_denom = 1;
// annual reduction factor inflation rate change
string annual_reduction_factor = 2 [
(cosmos_proto.scalar) = "cosmos.Dec",
(cosmos_proto.scalar) = "cosmos.Dec",
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false
];
Expand Down
11 changes: 7 additions & 4 deletions proto/mint/v1beta1/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ syntax = "proto3";

package mint.v1beta1;

import "amino/amino.proto";
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "mint/v1beta1/mint.proto";
import "amino/amino.proto";

option go_package = "github.com/okp4/okp4d/x/mint/types";

Expand Down Expand Up @@ -33,7 +33,10 @@ message QueryParamsRequest {}
// QueryParamsResponse is the response type for the Query/Params RPC method.
message QueryParamsResponse {
// params defines the parameters of the module.
Params params = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
Params params = 1 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}

// QueryInflationRequest is the request type for the Query/Inflation RPC method.
Expand All @@ -45,7 +48,7 @@ message QueryInflationResponse {
// inflation is the current minting inflation value.
bytes inflation = 1 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false,
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}
Expand All @@ -60,7 +63,7 @@ message QueryAnnualProvisionsResponse {
// annual_provisions is the current minting annual provisions value.
bytes annual_provisions = 1 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.nullable) = false,
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}
9 changes: 6 additions & 3 deletions proto/mint/v1beta1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ syntax = "proto3";

package mint.v1beta1;

import "cosmos/msg/v1/msg.proto";
import "amino/amino.proto";
import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";
import "mint/v1beta1/mint.proto";
Expand All @@ -26,15 +26,18 @@ service Msg {
// Since: cosmos-sdk 0.47
message MsgUpdateParams {
option (cosmos.msg.v1.signer) = "authority";
option (amino.name) = "cosmos-sdk/x/mint/MsgUpdateParams";
option (amino.name) = "cosmos-sdk/x/mint/MsgUpdateParams";

// authority is the address that controls the module (defaults to x/gov unless overwritten).
string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];

// params defines the x/mint parameters to update.
//
// NOTE: All parameters must be supplied.
Params params = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
Params params = 2 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}

// MsgUpdateParamsResponse defines the response structure for executing a
Expand Down
43 changes: 23 additions & 20 deletions proto/vesting/v1beta1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ syntax = "proto3";

package vesting.v1beta1;

import "amino/amino.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";
import "vesting/v1beta1/vesting.proto";
import "cosmos_proto/cosmos.proto";
import "amino/amino.proto";

option go_package = "github.com/okp4/okp4d/x/vesting/types";

Expand Down Expand Up @@ -37,15 +37,15 @@ service Msg {
// account.
message MsgCreateVestingAccount {
option (cosmos.msg.v1.signer) = "from_address";
option (amino.name) = "cosmos-sdk/MsgCreateVestingAccount";
option (amino.name) = "cosmos-sdk/MsgCreateVestingAccount";

option (gogoproto.equal) = true;

string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"];
repeated cosmos.base.v1beta1.Coin amount = 3 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];

Expand All @@ -62,14 +62,14 @@ message MsgCreateVestingAccountResponse {}
// Since: cosmos-sdk 0.46
message MsgCreatePermanentLockedAccount {
option (cosmos.msg.v1.signer) = "from_address";
option (amino.name) = "cosmos-sdk/MsgCreatePermLockedAccount";
option (gogoproto.equal) = true;
option (amino.name) = "cosmos-sdk/MsgCreatePermLockedAccount";
option (gogoproto.equal) = true;

string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""];
string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""];
repeated cosmos.base.v1beta1.Coin amount = 3 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
}
Expand All @@ -85,15 +85,18 @@ message MsgCreatePermanentLockedAccountResponse {}
// Since: cosmos-sdk 0.46
message MsgCreatePeriodicVestingAccount {
option (cosmos.msg.v1.signer) = "from_address";
option (amino.name) = "cosmos-sdk/MsgCreatePeriodicVestingAccount";
option (amino.name) = "cosmos-sdk/MsgCreatePeriodicVestingAccount";

option (gogoproto.equal) = false;

string from_address = 1;
string to_address = 2;
string from_address = 1;
string to_address = 2;
// start of vesting as unix time (in seconds).
int64 start_time = 3;
repeated Period vesting_periods = 4 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
int64 start_time = 3;
repeated Period vesting_periods = 4 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}

// MsgCreateVestingAccountResponse defines the Msg/CreatePeriodicVestingAccount
Expand All @@ -106,15 +109,15 @@ message MsgCreatePeriodicVestingAccountResponse {}
// account.
message MsgCreateCliffVestingAccount {
option (cosmos.msg.v1.signer) = "from_address";
option (amino.name) = "cosmos-sdk/MsgCreateCliffVestingAccount";
option (amino.name) = "cosmos-sdk/MsgCreateCliffVestingAccount";

option (gogoproto.equal) = true;

string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""];
string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""];
string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""];
repeated cosmos.base.v1beta1.Coin amount = 3 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];

Expand Down
26 changes: 14 additions & 12 deletions proto/vesting/v1beta1/vesting.proto
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,30 @@ import "amino/amino.proto";
import "cosmos/auth/v1beta1/auth.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";

option go_package = "github.com/okp4/okp4d/x/vesting/types";

// BaseVestingAccount implements the VestingAccount interface. It contains all
// the necessary fields needed for any vesting account implementation.
message BaseVestingAccount {
option (amino.name) = "cosmos-sdk/BaseVestingAccount";
option (amino.name) = "cosmos-sdk/BaseVestingAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true];
repeated cosmos.base.v1beta1.Coin original_vesting = 2 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
repeated cosmos.base.v1beta1.Coin delegated_free = 3 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
// Vesting end time, as unix timestamp (in seconds).
Expand All @@ -40,7 +39,7 @@ message BaseVestingAccount {
// ContinuousVestingAccount implements the VestingAccount interface. It
// continuously vests by unlocking coins linearly with respect to time.
message ContinuousVestingAccount {
option (amino.name) = "cosmos-sdk/ContinuousVestingAccount";
option (amino.name) = "cosmos-sdk/ContinuousVestingAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

Expand All @@ -53,7 +52,7 @@ message ContinuousVestingAccount {
// coins after a specific time, but non prior. In other words, it keeps them
// locked until a specified time.
message DelayedVestingAccount {
option (amino.name) = "cosmos-sdk/DelayedVestingAccount";
option (amino.name) = "cosmos-sdk/DelayedVestingAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

Expand All @@ -67,21 +66,24 @@ message Period {
int64 length = 1;
repeated cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true,
(amino.dont_omitempty) = true,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
}

// PeriodicVestingAccount implements the VestingAccount interface. It
// periodically vests by unlocking coins during each specified period.
message PeriodicVestingAccount {
option (amino.name) = "cosmos-sdk/PeriodicVestingAccount";
option (amino.name) = "cosmos-sdk/PeriodicVestingAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true];
int64 start_time = 2;
repeated Period vesting_periods = 3 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
repeated Period vesting_periods = 3 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}

// PermanentLockedAccount implements the VestingAccount interface. It does
Expand All @@ -90,7 +92,7 @@ message PeriodicVestingAccount {
//
// Since: cosmos-sdk 0.43
message PermanentLockedAccount {
option (amino.name) = "cosmos-sdk/PermanentLockedAccount";
option (amino.name) = "cosmos-sdk/PermanentLockedAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

Expand All @@ -100,7 +102,7 @@ message PermanentLockedAccount {
// CliffVestingAccount implements the VestingAccount interface. It
// continuously vests by unlocking coins after a cliff period linearly with respect to time.
message CliffVestingAccount {
option (amino.name) = "cosmos-sdk/CliffVestingAccount";
option (amino.name) = "cosmos-sdk/CliffVestingAccount";
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

Expand Down
24 changes: 12 additions & 12 deletions x/mint/types/genesis.pb.go

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

Loading

0 comments on commit 824c912

Please sign in to comment.