Skip to content

Commit

Permalink
fix: make linter happy
Browse files Browse the repository at this point in the history
  • Loading branch information
bdeneux committed Oct 4, 2022
1 parent 9d5ed7e commit 584851c
Show file tree
Hide file tree
Showing 144 changed files with 1,883 additions and 1,535 deletions.
1 change: 1 addition & 0 deletions proto/logic/v1beta/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
syntax = "proto3";

package logic.v1beta;

import "gogoproto/gogo.proto";
Expand Down
3 changes: 2 additions & 1 deletion proto/logic/v1beta/params.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
syntax = "proto3";

package logic.v1beta;

import "gogoproto/gogo.proto";
Expand All @@ -9,6 +10,6 @@ option go_package = "github.com/okp4/okp4d/x/logic/types";
message Params {
option (gogoproto.goproto_stringer) = false;

// foo represents a metasyntactic variable for testing purposes.
// foo represents a metasyntactic variable for testing purposes.
string foo = 1 [(gogoproto.moretags) = "yaml:\"foo\""];
}
2 changes: 1 addition & 1 deletion proto/logic/v1beta/query.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
syntax = "proto3";

package logic.v1beta;

import "gogoproto/gogo.proto";
Expand All @@ -23,4 +24,3 @@ message QueryServiceParamsResponse {
// params holds all the parameters of this module.
Params params = 1 [(gogoproto.nullable) = false];
}

4 changes: 2 additions & 2 deletions proto/logic/v1beta/tx.proto
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
syntax = "proto3";

package logic.v1beta;

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

// Msg defines the Msg service.
service MsgService {
}
service MsgService {}
45 changes: 25 additions & 20 deletions proto/vesting/v1beta1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
syntax = "proto3";

package vesting.v1beta1;

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

import "cosmos/msg/v1/msg.proto";
import "gogoproto/gogo.proto";
import "vesting/v1beta1/vesting.proto";

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

Expand Down Expand Up @@ -37,13 +36,15 @@ message MsgCreateVestingAccount {

option (gogoproto.equal) = true;

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

int64 end_time = 4;
bool delayed = 6;
bool delayed = 6;
}

// MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type.
Expand All @@ -56,10 +57,12 @@ message MsgCreateVestingAccountResponse {}
message MsgCreatePermanentLockedAccount {
option (gogoproto.equal) = true;

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, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
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,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
}

// MsgCreatePermanentLockedAccountResponse defines the Msg/CreatePermanentLockedAccount response type.
Expand All @@ -76,9 +79,9 @@ message MsgCreatePeriodicVestingAccount {

option (gogoproto.equal) = false;

string from_address = 1;
string to_address = 2;
int64 start_time = 3;
string from_address = 1;
string to_address = 2;
int64 start_time = 3;
repeated Period vesting_periods = 4 [(gogoproto.nullable) = false];
}

Expand All @@ -95,10 +98,12 @@ message MsgCreateCliffVestingAccount {

option (gogoproto.equal) = true;

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

int64 end_time = 4;
int64 cliff_time = 5;
Expand Down
52 changes: 30 additions & 22 deletions proto/vesting/v1beta1/vesting.proto
Original file line number Diff line number Diff line change
@@ -1,43 +1,50 @@
syntax = "proto3";

package vesting.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/auth/v1beta1/auth.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.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 (gogoproto.goproto_getters) = false;
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, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
repeated cosmos.base.v1beta1.Coin delegated_free = 3
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
repeated cosmos.base.v1beta1.Coin delegated_vesting = 4
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true];
repeated cosmos.base.v1beta1.Coin original_vesting = 2 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
repeated cosmos.base.v1beta1.Coin delegated_free = 3 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [
(gogoproto.nullable) = false,
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
int64 end_time = 5;
}

// ContinuousVestingAccount implements the VestingAccount interface. It
// continuously vests by unlocking coins linearly with respect to time.
message ContinuousVestingAccount {
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true];
int64 start_time = 2;
int64 start_time = 2;
}

// DelayedVestingAccount implements the VestingAccount interface. It vests all
// coins after a specific time, but non prior. In other words, it keeps them
// locked until a specified time.
message DelayedVestingAccount {
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;

BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true];
Expand All @@ -47,20 +54,22 @@ message DelayedVestingAccount {
message Period {
option (gogoproto.goproto_stringer) = false;

int64 length = 1;
repeated cosmos.base.v1beta1.Coin amount = 2
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
int64 length = 1;
repeated cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.nullable) = false,
(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 (gogoproto.goproto_getters) = false;
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];
int64 start_time = 2;
repeated Period vesting_periods = 3 [(gogoproto.nullable) = false];
}

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

BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true];
Expand All @@ -83,8 +92,7 @@ message CliffVestingAccount {

// base_vesting_account implements the VestingAccount interface. It contains
// all the necessary fields needed for any vesting account implementation
BaseVestingAccount base_vesting_account = 1
[ (gogoproto.embed) = true ];
BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true];
// start_time defines the time at which the vesting period begins
int64 start_time = 2;
int64 cliff_time = 3;
Expand Down
2 changes: 1 addition & 1 deletion third_party/proto/buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ breaking:
- tendermint
- gogoproto
- cosmos_proto
- google
- google
48 changes: 29 additions & 19 deletions third_party/proto/cosmos/auth/v1beta1/auth.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
syntax = "proto3";

package cosmos.auth.v1beta1;

import "cosmos_proto/cosmos.proto";
Expand All @@ -11,40 +12,49 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types";
// for basic account functionality. Any custom account type should extend this
// type for additional functionality (e.g. vesting).
message BaseAccount {
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;
option (gogoproto.equal) = false;
option (gogoproto.equal) = false;

option (cosmos_proto.implements_interface) = "AccountI";

string address = 1;
google.protobuf.Any pub_key = 2
[(gogoproto.jsontag) = "public_key,omitempty", (gogoproto.moretags) = "yaml:\"public_key\""];
string address = 1;
google.protobuf.Any pub_key = 2 [
(gogoproto.jsontag) = "public_key,omitempty",
(gogoproto.moretags) = "yaml:\"public_key\""
];
uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""];
uint64 sequence = 4;
uint64 sequence = 4;
}

// ModuleAccount defines an account for modules that holds coins on a pool.
message ModuleAccount {
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;
option (gogoproto.goproto_getters) = false;
option (gogoproto.goproto_stringer) = false;
option (cosmos_proto.implements_interface) = "ModuleAccountI";

BaseAccount base_account = 1 [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
string name = 2;
repeated string permissions = 3;
BaseAccount base_account = 1 [
(gogoproto.embed) = true,
(gogoproto.moretags) = "yaml:\"base_account\""
];
string name = 2;
repeated string permissions = 3;
}

// Params defines the parameters for the auth module.
message Params {
option (gogoproto.equal) = true;
option (gogoproto.equal) = true;
option (gogoproto.goproto_stringer) = false;

uint64 max_memo_characters = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""];
uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""];
uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""];
uint64 sig_verify_cost_ed25519 = 4
[(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""];
uint64 sig_verify_cost_secp256k1 = 5
[(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""];
uint64 max_memo_characters = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""];
uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""];
uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""];
uint64 sig_verify_cost_ed25519 = 4 [
(gogoproto.customname) = "SigVerifyCostED25519",
(gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""
];
uint64 sig_verify_cost_secp256k1 = 5 [
(gogoproto.customname) = "SigVerifyCostSecp256k1",
(gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""
];
}
5 changes: 3 additions & 2 deletions third_party/proto/cosmos/auth/v1beta1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
syntax = "proto3";

package cosmos.auth.v1beta1;

import "google/protobuf/any.proto";
import "gogoproto/gogo.proto";
import "cosmos/auth/v1beta1/auth.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto";

option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types";

Expand Down
9 changes: 5 additions & 4 deletions third_party/proto/cosmos/auth/v1beta1/query.proto
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
syntax = "proto3";

package cosmos.auth.v1beta1;

import "cosmos/auth/v1beta1/auth.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";
import "google/protobuf/any.proto";
import "google/api/annotations.proto";
import "cosmos/auth/v1beta1/auth.proto";
import "cosmos_proto/cosmos.proto";
import "google/protobuf/any.proto";

option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types";

Expand Down Expand Up @@ -51,7 +52,7 @@ message QueryAccountsResponse {

// QueryAccountRequest is the request type for the Query/Account RPC method.
message QueryAccountRequest {
option (gogoproto.equal) = false;
option (gogoproto.equal) = false;
option (gogoproto.goproto_getters) = false;

// address defines the address to query for.
Expand Down
Loading

0 comments on commit 584851c

Please sign in to comment.