lint and format protos

proto/tendermint/abci/types.proto

@@ -21,26 +21,26 @@ import "gogoproto/gogo.proto";
 
 message Request {
   oneof value {
-    RequestEcho                echo                  = 1;
-    RequestFlush               flush                 = 2;
-    RequestInfo                info                  = 3;
-    RequestInitChain           init_chain            = 4;
-    RequestQuery               query                 = 5;
-    RequestBeginBlock          begin_block           = 6 [deprecated = true];
-    RequestCheckTx             check_tx              = 7;
-    RequestDeliverTx           deliver_tx            = 8 [deprecated = true];
-    RequestEndBlock            end_block             = 9 [deprecated = true];
-    RequestCommit              commit                = 10;
-    RequestListSnapshots       list_snapshots        = 11;
-    RequestOfferSnapshot       offer_snapshot        = 12;
-    RequestLoadSnapshotChunk   load_snapshot_chunk   = 13;
-    RequestApplySnapshotChunk  apply_snapshot_chunk  = 14;
-    RequestPrepareProposal     prepare_proposal      = 15;
-    RequestProcessProposal     process_proposal      = 16;
-    RequestFinalizeBlock       finalize_block        = 19;
+    RequestEcho               echo                 = 1;
+    RequestFlush              flush                = 2;
+    RequestInfo               info                 = 3;
+    RequestInitChain          init_chain           = 4;
+    RequestQuery              query                = 5;
+    RequestBeginBlock         begin_block          = 6 [deprecated = true];
+    RequestCheckTx            check_tx             = 7;
+    RequestDeliverTx          deliver_tx           = 8 [deprecated = true];
+    RequestEndBlock           end_block            = 9 [deprecated = true];
+    RequestCommit             commit               = 10;
+    RequestListSnapshots      list_snapshots       = 11;
+    RequestOfferSnapshot      offer_snapshot       = 12;
+    RequestLoadSnapshotChunk  load_snapshot_chunk  = 13;
+    RequestApplySnapshotChunk apply_snapshot_chunk = 14;
+    RequestPrepareProposal    prepare_proposal     = 15;
+    RequestProcessProposal    process_proposal     = 16;
+    RequestFinalizeBlock      finalize_block       = 19;
   }
-  reserved 17; // Placeholder for RequestExtendVote in v0.37
-  reserved 18; // Placeholder for RequestVerifyVoteExtension in v0.37
+  reserved 17;  // Placeholder for RequestExtendVote in v0.37
+  reserved 18;  // Placeholder for RequestVerifyVoteExtension in v0.37
 }
 
 message RequestEcho {
@@ -123,15 +123,15 @@ message RequestApplySnapshotChunk {
 }
 
 message RequestPrepareProposal {
-  bytes                   hash                 = 1;
-  tendermint.types.Header header               = 2 [(gogoproto.nullable) = false];
+  bytes                   hash   = 1;
+  tendermint.types.Header header = 2 [(gogoproto.nullable) = false];
   // txs is an array of transactions that will be included in a block,
   // sent to the app for possible modifications.
-  repeated bytes          txs                  = 3;
-  LastCommitInfo          last_commit_info     = 4 [(gogoproto.nullable) = false];
-  repeated Evidence       byzantine_validators = 5 [(gogoproto.nullable) = false];
+  repeated bytes    txs                  = 3;
+  LastCommitInfo    last_commit_info     = 4 [(gogoproto.nullable) = false];
+  repeated Evidence byzantine_validators = 5 [(gogoproto.nullable) = false];
   // the modified transactions cannot exceed this size.
-  int64                   max_tx_bytes         = 6;
+  int64 max_tx_bytes = 6;
 }
 
 message RequestProcessProposal {
@@ -155,27 +155,27 @@ message RequestFinalizeBlock {
 
 message Response {
   oneof value {
-    ResponseException           exception             = 1;
-    ResponseEcho                echo                  = 2;
-    ResponseFlush               flush                 = 3;
-    ResponseInfo                info                  = 4;
-    ResponseInitChain           init_chain            = 5;
-    ResponseQuery               query                 = 6;
-    ResponseBeginBlock          begin_block           = 7 [deprecated = true];
-    ResponseCheckTx             check_tx              = 8;
-    ResponseDeliverTx           deliver_tx            = 9 [deprecated = true];
-    ResponseEndBlock            end_block             = 10 [deprecated = true];
-    ResponseCommit              commit                = 11;
-    ResponseListSnapshots       list_snapshots        = 12;
-    ResponseOfferSnapshot       offer_snapshot        = 13;
-    ResponseLoadSnapshotChunk   load_snapshot_chunk   = 14;
-    ResponseApplySnapshotChunk  apply_snapshot_chunk  = 15;
-    ResponsePrepareProposal     prepare_proposal      = 16;
-    ResponseProcessProposal     process_proposal      = 17;
-    ResponseFinalizeBlock       finalize_block        = 20;
+    ResponseException          exception            = 1;
+    ResponseEcho               echo                 = 2;
+    ResponseFlush              flush                = 3;
+    ResponseInfo               info                 = 4;
+    ResponseInitChain          init_chain           = 5;
+    ResponseQuery              query                = 6;
+    ResponseBeginBlock         begin_block          = 7 [deprecated = true];
+    ResponseCheckTx            check_tx             = 8;
+    ResponseDeliverTx          deliver_tx           = 9 [deprecated = true];
+    ResponseEndBlock           end_block            = 10 [deprecated = true];
+    ResponseCommit             commit               = 11;
+    ResponseListSnapshots      list_snapshots       = 12;
+    ResponseOfferSnapshot      offer_snapshot       = 13;
+    ResponseLoadSnapshotChunk  load_snapshot_chunk  = 14;
+    ResponseApplySnapshotChunk apply_snapshot_chunk = 15;
+    ResponsePrepareProposal    prepare_proposal     = 16;
+    ResponseProcessProposal    process_proposal     = 17;
+    ResponseFinalizeBlock      finalize_block       = 20;
   }
-  reserved 18; // Placeholder for ResponseExtendVote in v0.37
-  reserved 19; // Placeholder for ResponseVerifyVoteExtension in v0.37
+  reserved 18;  // Placeholder for ResponseExtendVote in v0.37
+  reserved 19;  // Placeholder for ResponseVerifyVoteExtension in v0.37
 }
 
 // nondeterministic
@@ -308,7 +308,7 @@ message ResponsePrepareProposal {
   repeated ExecTxResult            tx_results              = 4;
   repeated ValidatorUpdate         validator_updates       = 5;
   tendermint.types.ConsensusParams consensus_param_updates = 6;
-  reserved 7; // Placeholder for app_signed_updates in v0.37
+  reserved 7;  // Placeholder for app_signed_updates in v0.37
 }
 
 message ResponseProcessProposal {
@@ -320,7 +320,7 @@ message ResponseProcessProposal {
 }
 
 message ResponseFinalizeBlock {
-  repeated Event                   block_events            = 1
+  repeated Event block_events = 1
       [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
   repeated ExecTxResult            tx_results              = 2;
   repeated ValidatorUpdate         validator_updates       = 3;
@@ -364,7 +364,7 @@ message ExecTxResult {
   int64          gas_used   = 6;
   repeated Event tx_events  = 7
       [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];  // nondeterministic
-  string          codespace = 8;
+  string codespace = 8;
 }
 
 // TxResult contains results of executing the transaction.
@@ -378,8 +378,8 @@ message TxResult {
 }
 
 message TxRecord {
-  TxAction action           = 1;
-  bytes tx                  = 2;
+  TxAction       action     = 1;
+  bytes          tx         = 2;
   repeated bytes new_hashes = 3;
 
   // TxAction contains App-provided information on what to do with a transaction that is part of a raw proposal
@@ -410,10 +410,10 @@ message ValidatorUpdate {
 
 // VoteInfo
 message VoteInfo {
-  Validator validator                   = 1 [(gogoproto.nullable) = false];
-  bool      signed_last_block           = 2;
-  reserved 3; // Placeholder for tendermint_signed_extension in v0.37
-  reserved 4; // Placeholder for app_signed_extension in v0.37
+  Validator validator         = 1 [(gogoproto.nullable) = false];
+  bool      signed_last_block = 2;
+  reserved 3;  // Placeholder for tendermint_signed_extension in v0.37
+  reserved 4;  // Placeholder for app_signed_extension in v0.37
 }
 
 enum EvidenceType {

proto/tendermint/consensus/wal.proto

@@ -1,8 +1,6 @@
 syntax = "proto3";
 package tendermint.consensus;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus";
-
 import "gogoproto/gogo.proto";
 import "tendermint/consensus/types.proto";
 import "tendermint/types/events.proto";

proto/tendermint/privval/service.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package tendermint.privval;
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
+option  go_package = "github.com/tendermint/tendermint/proto/tendermint/privval";
 
 import "tendermint/privval/types.proto";
 

proto/tendermint/types/canonical.proto

@@ -1,8 +1,6 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
-
 import "gogoproto/gogo.proto";
 import "tendermint/types/types.proto";
 import "google/protobuf/timestamp.proto";
@@ -34,5 +32,4 @@ message CanonicalVote {
   CanonicalBlockID          block_id  = 4 [(gogoproto.customname) = "BlockID"];
   google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
   string                    chain_id  = 6 [(gogoproto.customname) = "ChainID"];
-  VoteExtensionToSign       vote_extension = 7;
 }

proto/tendermint/types/events.proto

@@ -1,8 +1,6 @@
 syntax = "proto3";
 package tendermint.types;
 
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/types";
-
 message EventDataRoundState {
   int64  height = 1;
   int32  round  = 2;