From 12c8357d33bd917820d7ed276a966dcb6317181a Mon Sep 17 00:00:00 2001 From: Ismail Khoffi Date: Fri, 14 Jun 2019 13:25:43 +0200 Subject: [PATCH 01/10] add crates.io badge (#73) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d6d938..7faaf2c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ Tendermint ABCI server, written in Rust programming language. -[![](https://tokei.rs/b1/github/tendermint/rust-abci)](https://github.com/tendermint/rust-abci) [![CircleCI](https://circleci.com/gh/tendermint/rust-abci/tree/master.svg?style=shield)](https://circleci.com/gh/tendermint/rust-abci/tree/master) +[![Current Version](https://meritbadge.herokuapp.com/abci)](https://crates.io/crates/abci) +[![](https://tokei.rs/b1/github/tendermint/rust-abci)](https://github.com/tendermint/rust-abci) +[![CircleCI](https://circleci.com/gh/tendermint/rust-abci/tree/master.svg?style=shield)](https://circleci.com/gh/tendermint/rust-abci/tree/master) This library implements the [ABCI protocol](https://tendermint.com/docs/spec/abci/) and can be used to write ABCI From dc8d359ed12957e98af0d267345c93634af80e34 Mon Sep 17 00:00:00 2001 From: Ismail Khoffi Date: Mon, 1 Jul 2019 14:14:18 +0200 Subject: [PATCH 02/10] update to tendermint v0.32 (#77) --- Cargo.toml | 2 +- Makefile | 3 +- README.md | 2 +- protobuf/abci.proto | 13 +- .../tendermint/abci/types/types.proto | 15 +- src/messages/abci.rs | 489 +++++++++++++----- src/messages/merkle.rs | 4 +- src/messages/types.rs | 2 +- version.txt | 2 +- 9 files changed, 382 insertions(+), 150 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e915b08..a4429d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "abci" -version = "0.5.4" +version = "0.6.0" authors = ["Adrian Brink ", "Jackson Lewis ", "Dave Bryson", "Tomas Tauber"] license = "MIT/Apache-2.0" description = "Tendermint ABCI server for Rust" diff --git a/Makefile b/Makefile index e670e91..d06a441 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ # Origin -tendermint = https://raw.githubusercontent.com/tendermint/tendermint/master +version_branch = v0.32 +tendermint = https://raw.githubusercontent.com/tendermint/tendermint/$(version_branch) # Outputs tmkv = protobuf/github.com/tendermint/tendermint/libs/common/types.proto diff --git a/README.md b/README.md index 7faaf2c..f758967 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ protocol](https://tendermint.com/docs/spec/abci/) and can be used to write ABCI applications for [Tendermint](https://github.com/tendermint/tendermint/). ## Supported Version -- Tendermint 0.31.0 +- Tendermint 0.32.0 - ABCI 0.16.0 ## Installation diff --git a/protobuf/abci.proto b/protobuf/abci.proto index 43674a7..5702c0f 100644 --- a/protobuf/abci.proto +++ b/protobuf/abci.proto @@ -165,7 +165,7 @@ message ResponseQuery { } message ResponseBeginBlock { - repeated common.KVPair tags = 1 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 1 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; } message ResponseCheckTx { @@ -175,7 +175,7 @@ message ResponseCheckTx { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; string codespace = 8; } @@ -186,14 +186,14 @@ message ResponseDeliverTx { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; string codespace = 8; } message ResponseEndBlock { repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable)=false]; ConsensusParams consensus_param_updates = 2; - repeated common.KVPair tags = 3 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 3 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; } message ResponseCommit { @@ -236,6 +236,11 @@ message LastCommitInfo { repeated VoteInfo votes = 2 [(gogoproto.nullable)=false]; } +message Event { + string type = 1; + repeated common.KVPair attributes = 2 [(gogoproto.nullable)=false, (gogoproto.jsontag)="attributes,omitempty"]; +} + //---------------------------------------- // Blockchain Types diff --git a/protobuf/github.com/tendermint/tendermint/abci/types/types.proto b/protobuf/github.com/tendermint/tendermint/abci/types/types.proto index 8eeecb3..8a2da5b 100644 --- a/protobuf/github.com/tendermint/tendermint/abci/types/types.proto +++ b/protobuf/github.com/tendermint/tendermint/abci/types/types.proto @@ -165,7 +165,7 @@ message ResponseQuery { } message ResponseBeginBlock { - repeated common.KVPair tags = 1 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 1 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; } message ResponseCheckTx { @@ -175,7 +175,7 @@ message ResponseCheckTx { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; string codespace = 8; } @@ -186,14 +186,14 @@ message ResponseDeliverTx { string info = 4; // nondeterministic int64 gas_wanted = 5; int64 gas_used = 6; - repeated common.KVPair tags = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 7 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; string codespace = 8; } message ResponseEndBlock { repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable)=false]; ConsensusParams consensus_param_updates = 2; - repeated common.KVPair tags = 3 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; + repeated Event events = 3 [(gogoproto.nullable)=false, (gogoproto.jsontag)="events,omitempty"]; } message ResponseCommit { @@ -212,7 +212,7 @@ message ConsensusParams { ValidatorParams validator = 3; } -// BlockParams contains limits on the block size and timestamp. +// BlockParams contains limits on the block size. message BlockParams { // Note: must be greater than 0 int64 max_bytes = 1; @@ -236,6 +236,11 @@ message LastCommitInfo { repeated VoteInfo votes = 2 [(gogoproto.nullable)=false]; } +message Event { + string type = 1; + repeated common.KVPair attributes = 2 [(gogoproto.nullable)=false, (gogoproto.jsontag)="attributes,omitempty"]; +} + //---------------------------------------- // Blockchain Types diff --git a/src/messages/abci.rs b/src/messages/abci.rs index 67398ee..1c18e19 100644 --- a/src/messages/abci.rs +++ b/src/messages/abci.rs @@ -6175,7 +6175,7 @@ impl ::protobuf::reflect::ProtobufValue for ResponseQuery { #[derive(PartialEq,Clone,Default)] pub struct ResponseBeginBlock { // message fields - pub tags: ::protobuf::RepeatedField, + pub events: ::protobuf::RepeatedField, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, @@ -6192,35 +6192,35 @@ impl ResponseBeginBlock { ::std::default::Default::default() } - // repeated .common.KVPair tags = 1; + // repeated .abci.Event events = 1; - pub fn get_tags(&self) -> &[super::types::KVPair] { - &self.tags + pub fn get_events(&self) -> &[Event] { + &self.events } - pub fn clear_tags(&mut self) { - self.tags.clear(); + pub fn clear_events(&mut self) { + self.events.clear(); } // Param is passed by value, moved - pub fn set_tags(&mut self, v: ::protobuf::RepeatedField) { - self.tags = v; + pub fn set_events(&mut self, v: ::protobuf::RepeatedField) { + self.events = v; } // Mutable pointer to the field. - pub fn mut_tags(&mut self) -> &mut ::protobuf::RepeatedField { - &mut self.tags + pub fn mut_events(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.events } // Take field - pub fn take_tags(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.tags, ::protobuf::RepeatedField::new()) + pub fn take_events(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.events, ::protobuf::RepeatedField::new()) } } impl ::protobuf::Message for ResponseBeginBlock { fn is_initialized(&self) -> bool { - for v in &self.tags { + for v in &self.events { if !v.is_initialized() { return false; } @@ -6233,7 +6233,7 @@ impl ::protobuf::Message for ResponseBeginBlock { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.tags)?; + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.events)?; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -6247,7 +6247,7 @@ impl ::protobuf::Message for ResponseBeginBlock { #[allow(unused_variables)] fn compute_size(&self) -> u32 { let mut my_size = 0; - for value in &self.tags { + for value in &self.events { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; @@ -6257,7 +6257,7 @@ impl ::protobuf::Message for ResponseBeginBlock { } fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { - for v in &self.tags { + for v in &self.events { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -6304,10 +6304,10 @@ impl ::protobuf::Message for ResponseBeginBlock { unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "tags", - |m: &ResponseBeginBlock| { &m.tags }, - |m: &mut ResponseBeginBlock| { &mut m.tags }, + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "events", + |m: &ResponseBeginBlock| { &m.events }, + |m: &mut ResponseBeginBlock| { &mut m.events }, )); ::protobuf::reflect::MessageDescriptor::new::( "ResponseBeginBlock", @@ -6331,7 +6331,7 @@ impl ::protobuf::Message for ResponseBeginBlock { impl ::protobuf::Clear for ResponseBeginBlock { fn clear(&mut self) { - self.tags.clear(); + self.events.clear(); self.unknown_fields.clear(); } } @@ -6357,7 +6357,7 @@ pub struct ResponseCheckTx { pub info: ::std::string::String, pub gas_wanted: i64, pub gas_used: i64, - pub tags: ::protobuf::RepeatedField, + pub events: ::protobuf::RepeatedField, pub codespace: ::std::string::String, // special fields pub unknown_fields: ::protobuf::UnknownFields, @@ -6498,29 +6498,29 @@ impl ResponseCheckTx { self.gas_used = v; } - // repeated .common.KVPair tags = 7; + // repeated .abci.Event events = 7; - pub fn get_tags(&self) -> &[super::types::KVPair] { - &self.tags + pub fn get_events(&self) -> &[Event] { + &self.events } - pub fn clear_tags(&mut self) { - self.tags.clear(); + pub fn clear_events(&mut self) { + self.events.clear(); } // Param is passed by value, moved - pub fn set_tags(&mut self, v: ::protobuf::RepeatedField) { - self.tags = v; + pub fn set_events(&mut self, v: ::protobuf::RepeatedField) { + self.events = v; } // Mutable pointer to the field. - pub fn mut_tags(&mut self) -> &mut ::protobuf::RepeatedField { - &mut self.tags + pub fn mut_events(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.events } // Take field - pub fn take_tags(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.tags, ::protobuf::RepeatedField::new()) + pub fn take_events(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.events, ::protobuf::RepeatedField::new()) } // string codespace = 8; @@ -6552,7 +6552,7 @@ impl ResponseCheckTx { impl ::protobuf::Message for ResponseCheckTx { fn is_initialized(&self) -> bool { - for v in &self.tags { + for v in &self.events { if !v.is_initialized() { return false; } @@ -6595,7 +6595,7 @@ impl ::protobuf::Message for ResponseCheckTx { self.gas_used = tmp; }, 7 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.tags)?; + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.events)?; }, 8 => { ::protobuf::rt::read_singular_proto3_string_into(wire_type, is, &mut self.codespace)?; @@ -6630,7 +6630,7 @@ impl ::protobuf::Message for ResponseCheckTx { if self.gas_used != 0 { my_size += ::protobuf::rt::value_size(6, self.gas_used, ::protobuf::wire_format::WireTypeVarint); } - for value in &self.tags { + for value in &self.events { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; @@ -6661,7 +6661,7 @@ impl ::protobuf::Message for ResponseCheckTx { if self.gas_used != 0 { os.write_int64(6, self.gas_used)?; } - for v in &self.tags { + for v in &self.events { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -6741,10 +6741,10 @@ impl ::protobuf::Message for ResponseCheckTx { |m: &ResponseCheckTx| { &m.gas_used }, |m: &mut ResponseCheckTx| { &mut m.gas_used }, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "tags", - |m: &ResponseCheckTx| { &m.tags }, - |m: &mut ResponseCheckTx| { &mut m.tags }, + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "events", + |m: &ResponseCheckTx| { &m.events }, + |m: &mut ResponseCheckTx| { &mut m.events }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( "codespace", @@ -6779,7 +6779,7 @@ impl ::protobuf::Clear for ResponseCheckTx { self.info.clear(); self.gas_wanted = 0; self.gas_used = 0; - self.tags.clear(); + self.events.clear(); self.codespace.clear(); self.unknown_fields.clear(); } @@ -6806,7 +6806,7 @@ pub struct ResponseDeliverTx { pub info: ::std::string::String, pub gas_wanted: i64, pub gas_used: i64, - pub tags: ::protobuf::RepeatedField, + pub events: ::protobuf::RepeatedField, pub codespace: ::std::string::String, // special fields pub unknown_fields: ::protobuf::UnknownFields, @@ -6947,29 +6947,29 @@ impl ResponseDeliverTx { self.gas_used = v; } - // repeated .common.KVPair tags = 7; + // repeated .abci.Event events = 7; - pub fn get_tags(&self) -> &[super::types::KVPair] { - &self.tags + pub fn get_events(&self) -> &[Event] { + &self.events } - pub fn clear_tags(&mut self) { - self.tags.clear(); + pub fn clear_events(&mut self) { + self.events.clear(); } // Param is passed by value, moved - pub fn set_tags(&mut self, v: ::protobuf::RepeatedField) { - self.tags = v; + pub fn set_events(&mut self, v: ::protobuf::RepeatedField) { + self.events = v; } // Mutable pointer to the field. - pub fn mut_tags(&mut self) -> &mut ::protobuf::RepeatedField { - &mut self.tags + pub fn mut_events(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.events } // Take field - pub fn take_tags(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.tags, ::protobuf::RepeatedField::new()) + pub fn take_events(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.events, ::protobuf::RepeatedField::new()) } // string codespace = 8; @@ -7001,7 +7001,7 @@ impl ResponseDeliverTx { impl ::protobuf::Message for ResponseDeliverTx { fn is_initialized(&self) -> bool { - for v in &self.tags { + for v in &self.events { if !v.is_initialized() { return false; } @@ -7044,7 +7044,7 @@ impl ::protobuf::Message for ResponseDeliverTx { self.gas_used = tmp; }, 7 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.tags)?; + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.events)?; }, 8 => { ::protobuf::rt::read_singular_proto3_string_into(wire_type, is, &mut self.codespace)?; @@ -7079,7 +7079,7 @@ impl ::protobuf::Message for ResponseDeliverTx { if self.gas_used != 0 { my_size += ::protobuf::rt::value_size(6, self.gas_used, ::protobuf::wire_format::WireTypeVarint); } - for value in &self.tags { + for value in &self.events { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; @@ -7110,7 +7110,7 @@ impl ::protobuf::Message for ResponseDeliverTx { if self.gas_used != 0 { os.write_int64(6, self.gas_used)?; } - for v in &self.tags { + for v in &self.events { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -7190,10 +7190,10 @@ impl ::protobuf::Message for ResponseDeliverTx { |m: &ResponseDeliverTx| { &m.gas_used }, |m: &mut ResponseDeliverTx| { &mut m.gas_used }, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "tags", - |m: &ResponseDeliverTx| { &m.tags }, - |m: &mut ResponseDeliverTx| { &mut m.tags }, + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "events", + |m: &ResponseDeliverTx| { &m.events }, + |m: &mut ResponseDeliverTx| { &mut m.events }, )); fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( "codespace", @@ -7228,7 +7228,7 @@ impl ::protobuf::Clear for ResponseDeliverTx { self.info.clear(); self.gas_wanted = 0; self.gas_used = 0; - self.tags.clear(); + self.events.clear(); self.codespace.clear(); self.unknown_fields.clear(); } @@ -7251,7 +7251,7 @@ pub struct ResponseEndBlock { // message fields pub validator_updates: ::protobuf::RepeatedField, pub consensus_param_updates: ::protobuf::SingularPtrField, - pub tags: ::protobuf::RepeatedField, + pub events: ::protobuf::RepeatedField, // special fields pub unknown_fields: ::protobuf::UnknownFields, pub cached_size: ::protobuf::CachedSize, @@ -7326,29 +7326,29 @@ impl ResponseEndBlock { self.consensus_param_updates.take().unwrap_or_else(|| ConsensusParams::new()) } - // repeated .common.KVPair tags = 3; + // repeated .abci.Event events = 3; - pub fn get_tags(&self) -> &[super::types::KVPair] { - &self.tags + pub fn get_events(&self) -> &[Event] { + &self.events } - pub fn clear_tags(&mut self) { - self.tags.clear(); + pub fn clear_events(&mut self) { + self.events.clear(); } // Param is passed by value, moved - pub fn set_tags(&mut self, v: ::protobuf::RepeatedField) { - self.tags = v; + pub fn set_events(&mut self, v: ::protobuf::RepeatedField) { + self.events = v; } // Mutable pointer to the field. - pub fn mut_tags(&mut self) -> &mut ::protobuf::RepeatedField { - &mut self.tags + pub fn mut_events(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.events } // Take field - pub fn take_tags(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.tags, ::protobuf::RepeatedField::new()) + pub fn take_events(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.events, ::protobuf::RepeatedField::new()) } } @@ -7364,7 +7364,7 @@ impl ::protobuf::Message for ResponseEndBlock { return false; } }; - for v in &self.tags { + for v in &self.events { if !v.is_initialized() { return false; } @@ -7383,7 +7383,7 @@ impl ::protobuf::Message for ResponseEndBlock { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.consensus_param_updates)?; }, 3 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.tags)?; + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.events)?; }, _ => { ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; @@ -7405,7 +7405,7 @@ impl ::protobuf::Message for ResponseEndBlock { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; } - for value in &self.tags { + for value in &self.events { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; }; @@ -7425,7 +7425,7 @@ impl ::protobuf::Message for ResponseEndBlock { os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; } - for v in &self.tags { + for v in &self.events { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; @@ -7482,10 +7482,10 @@ impl ::protobuf::Message for ResponseEndBlock { |m: &ResponseEndBlock| { &m.consensus_param_updates }, |m: &mut ResponseEndBlock| { &mut m.consensus_param_updates }, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "tags", - |m: &ResponseEndBlock| { &m.tags }, - |m: &mut ResponseEndBlock| { &mut m.tags }, + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "events", + |m: &ResponseEndBlock| { &m.events }, + |m: &mut ResponseEndBlock| { &mut m.events }, )); ::protobuf::reflect::MessageDescriptor::new::( "ResponseEndBlock", @@ -7511,7 +7511,7 @@ impl ::protobuf::Clear for ResponseEndBlock { fn clear(&mut self) { self.validator_updates.clear(); self.consensus_param_updates.clear(); - self.tags.clear(); + self.events.clear(); self.unknown_fields.clear(); } } @@ -8733,6 +8733,224 @@ impl ::protobuf::reflect::ProtobufValue for LastCommitInfo { } } +#[derive(PartialEq,Clone,Default)] +pub struct Event { + // message fields + pub field_type: ::std::string::String, + pub attributes: ::protobuf::RepeatedField, + // special fields + pub unknown_fields: ::protobuf::UnknownFields, + pub cached_size: ::protobuf::CachedSize, +} + +impl<'a> ::std::default::Default for &'a Event { + fn default() -> &'a Event { + ::default_instance() + } +} + +impl Event { + pub fn new() -> Event { + ::std::default::Default::default() + } + + // string type = 1; + + + pub fn get_field_type(&self) -> &str { + &self.field_type + } + pub fn clear_field_type(&mut self) { + self.field_type.clear(); + } + + // Param is passed by value, moved + pub fn set_field_type(&mut self, v: ::std::string::String) { + self.field_type = v; + } + + // Mutable pointer to the field. + // If field is not initialized, it is initialized with default value first. + pub fn mut_field_type(&mut self) -> &mut ::std::string::String { + &mut self.field_type + } + + // Take field + pub fn take_field_type(&mut self) -> ::std::string::String { + ::std::mem::replace(&mut self.field_type, ::std::string::String::new()) + } + + // repeated .common.KVPair attributes = 2; + + + pub fn get_attributes(&self) -> &[super::types::KVPair] { + &self.attributes + } + pub fn clear_attributes(&mut self) { + self.attributes.clear(); + } + + // Param is passed by value, moved + pub fn set_attributes(&mut self, v: ::protobuf::RepeatedField) { + self.attributes = v; + } + + // Mutable pointer to the field. + pub fn mut_attributes(&mut self) -> &mut ::protobuf::RepeatedField { + &mut self.attributes + } + + // Take field + pub fn take_attributes(&mut self) -> ::protobuf::RepeatedField { + ::std::mem::replace(&mut self.attributes, ::protobuf::RepeatedField::new()) + } +} + +impl ::protobuf::Message for Event { + fn is_initialized(&self) -> bool { + for v in &self.attributes { + if !v.is_initialized() { + return false; + } + }; + true + } + + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + while !is.eof()? { + let (field_number, wire_type) = is.read_tag_unpack()?; + match field_number { + 1 => { + ::protobuf::rt::read_singular_proto3_string_into(wire_type, is, &mut self.field_type)?; + }, + 2 => { + ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.attributes)?; + }, + _ => { + ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; + }, + }; + } + ::std::result::Result::Ok(()) + } + + // Compute sizes of nested messages + #[allow(unused_variables)] + fn compute_size(&self) -> u32 { + let mut my_size = 0; + if !self.field_type.is_empty() { + my_size += ::protobuf::rt::string_size(1, &self.field_type); + } + for value in &self.attributes { + let len = value.compute_size(); + my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; + }; + my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); + self.cached_size.set(my_size); + my_size + } + + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + if !self.field_type.is_empty() { + os.write_string(1, &self.field_type)?; + } + for v in &self.attributes { + os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; + os.write_raw_varint32(v.get_cached_size())?; + v.write_to_with_cached_sizes(os)?; + }; + os.write_unknown_fields(self.get_unknown_fields())?; + ::std::result::Result::Ok(()) + } + + fn get_cached_size(&self) -> u32 { + self.cached_size.get() + } + + fn get_unknown_fields(&self) -> &::protobuf::UnknownFields { + &self.unknown_fields + } + + fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields { + &mut self.unknown_fields + } + + fn as_any(&self) -> &::std::any::Any { + self as &::std::any::Any + } + fn as_any_mut(&mut self) -> &mut ::std::any::Any { + self as &mut ::std::any::Any + } + fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + self + } + + fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor { + Self::descriptor_static() + } + + fn new() -> Event { + Event::new() + } + + fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, + }; + unsafe { + descriptor.get(|| { + let mut fields = ::std::vec::Vec::new(); + fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( + "type", + |m: &Event| { &m.field_type }, + |m: &mut Event| { &mut m.field_type }, + )); + fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( + "attributes", + |m: &Event| { &m.attributes }, + |m: &mut Event| { &mut m.attributes }, + )); + ::protobuf::reflect::MessageDescriptor::new::( + "Event", + fields, + file_descriptor_proto() + ) + }) + } + } + + fn default_instance() -> &'static Event { + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { + lock: ::protobuf::lazy::ONCE_INIT, + ptr: 0 as *const Event, + }; + unsafe { + instance.get(Event::new) + } + } +} + +impl ::protobuf::Clear for Event { + fn clear(&mut self) { + self.field_type.clear(); + self.attributes.clear(); + self.unknown_fields.clear(); + } +} + +impl ::std::fmt::Debug for Event { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + ::protobuf::text_format::fmt(self, f) + } +} + +impl ::protobuf::reflect::ProtobufValue for Event { + fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { + ::protobuf::reflect::ProtobufValueRef::Message(self) + } +} + #[derive(PartialEq,Clone,Default)] pub struct Header { // message fields @@ -11408,7 +11626,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x03\x20\x01(\x04B\0:\0\"4\n\x10RequestSetOption\x12\r\n\x03key\x18\ \x01\x20\x01(\tB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\tB\0:\0\"\xdb\x01\ \n\x10RequestInitChain\x122\n\x04time\x18\x01\x20\x01(\x0b2\x1a.google.p\ - rotobuf.TimestampB\x08\xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x12\n\x08chain_\ + rotobuf.TimestampB\x08\x90\xdf\x1f\x01\xc8\xde\x1f\0\x12\x12\n\x08chain_\ id\x18\x02\x20\x01(\tB\0\x121\n\x10consensus_params\x18\x03\x20\x01(\x0b\ 2\x15.abci.ConsensusParamsB\0\x12/\n\nvalidators\x18\x04\x20\x03(\x0b2\ \x15.abci.ValidatorUpdateB\x04\xc8\xde\x1f\0\x12\x19\n\x0fapp_state_byte\ @@ -11452,67 +11670,70 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \0\x12\r\n\x03key\x18\x06\x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x07\x20\ \x01(\x0cB\0\x12\x1e\n\x05proof\x18\x08\x20\x01(\x0b2\r.merkle.ProofB\0\ \x12\x10\n\x06height\x18\t\x20\x01(\x03B\0\x12\x13\n\tcodespace\x18\n\ - \x20\x01(\tB\0:\0\"L\n\x12ResponseBeginBlock\x124\n\x04tags\x18\x01\x20\ - \x03(\x0b2\x0e.common.KVPairB\x16\xc8\xde\x1f\0\xea\xde\x1f\x0etags,omit\ - empty:\0\"\xc7\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ + \x20\x01(\tB\0:\0\"M\n\x12ResponseBeginBlock\x125\n\x06events\x18\x01\ + \x20\x03(\x0b2\x0b.abci.EventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,o\ + mitempty:\0\"\xc8\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ \x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\x18\ \x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\nga\ s_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\x01(\ - \x03B\0\x124\n\x04tags\x18\x07\x20\x03(\x0b2\x0e.common.KVPairB\x16\xea\ - \xde\x1f\x0etags,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\x18\x08\ - \x20\x01(\tB\0:\0\"\xc9\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\x18\ + \x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\x18\xc8\ + \xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\x18\x08\ + \x20\x01(\tB\0:\0\"\xca\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\x18\ \x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03\ log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\ \x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\ - \x20\x01(\x03B\0\x124\n\x04tags\x18\x07\x20\x03(\x0b2\x0e.common.KVPairB\ - \x16\xea\xde\x1f\x0etags,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\ - \x18\x08\x20\x01(\tB\0:\0\"\xbc\x01\n\x10ResponseEndBlock\x126\n\x11vali\ + \x20\x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\ + \x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\ + \x18\x08\x20\x01(\tB\0:\0\"\xbd\x01\n\x10ResponseEndBlock\x126\n\x11vali\ dator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ \xde\x1f\0\x128\n\x17consensus_param_updates\x18\x02\x20\x01(\x0b2\x15.a\ - bci.ConsensusParamsB\0\x124\n\x04tags\x18\x03\x20\x03(\x0b2\x0e.common.K\ - VPairB\x16\xea\xde\x1f\x0etags,omitempty\xc8\xde\x1f\0:\0\"\"\n\x0eRespo\ - nseCommit\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0:\0\"\x8d\x01\n\x0fCo\ - nsensusParams\x12\"\n\x05block\x18\x01\x20\x01(\x0b2\x11.abci.BlockParam\ - sB\0\x12(\n\x08evidence\x18\x02\x20\x01(\x0b2\x14.abci.EvidenceParamsB\0\ - \x12*\n\tvalidator\x18\x03\x20\x01(\x0b2\x15.abci.ValidatorParamsB\0:\0\ - \"7\n\x0bBlockParams\x12\x13\n\tmax_bytes\x18\x01\x20\x01(\x03B\0\x12\ + bci.ConsensusParamsB\0\x125\n\x06events\x18\x03\x20\x03(\x0b2\x0b.abci.E\ + ventB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0:\0\"\"\n\x0eResp\ + onseCommit\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0:\0\"\x8d\x01\n\x0fC\ + onsensusParams\x12\"\n\x05block\x18\x01\x20\x01(\x0b2\x11.abci.BlockPara\ + msB\0\x12(\n\x08evidence\x18\x02\x20\x01(\x0b2\x14.abci.EvidenceParamsB\ + \0\x12*\n\tvalidator\x18\x03\x20\x01(\x0b2\x15.abci.ValidatorParamsB\0:\ + \0\"7\n\x0bBlockParams\x12\x13\n\tmax_bytes\x18\x01\x20\x01(\x03B\0\x12\ \x11\n\x07max_gas\x18\x02\x20\x01(\x03B\0:\0\"%\n\x0eEvidenceParams\x12\ \x11\n\x07max_age\x18\x01\x20\x01(\x03B\0:\0\",\n\x0fValidatorParams\x12\ \x17\n\rpub_key_types\x18\x01\x20\x03(\tB\0:\0\"H\n\x0eLastCommitInfo\ \x12\x0f\n\x05round\x18\x01\x20\x01(\x05B\0\x12#\n\x05votes\x18\x02\x20\ - \x03(\x0b2\x0e.abci.VoteInfoB\x04\xc8\xde\x1f\0:\0\"\xd5\x03\n\x06Header\ - \x12$\n\x07version\x18\x01\x20\x01(\x0b2\r.abci.VersionB\x04\xc8\xde\x1f\ - \0\x12\x1d\n\x08chain_id\x18\x02\x20\x01(\tB\x0b\xe2\xde\x1f\x07ChainID\ - \x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\x122\n\x04time\x18\x04\x20\ - \x01(\x0b2\x1a.google.protobuf.TimestampB\x08\xc8\xde\x1f\0\x90\xdf\x1f\ - \x01\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03B\0\x12\x13\n\ttotal_txs\ - \x18\x06\x20\x01(\x03B\0\x12*\n\rlast_block_id\x18\x07\x20\x01(\x0b2\r.a\ - bci.BlockIDB\x04\xc8\xde\x1f\0\x12\x1a\n\x10last_commit_hash\x18\x08\x20\ - \x01(\x0cB\0\x12\x13\n\tdata_hash\x18\t\x20\x01(\x0cB\0\x12\x19\n\x0fval\ - idators_hash\x18\n\x20\x01(\x0cB\0\x12\x1e\n\x14next_validators_hash\x18\ - \x0b\x20\x01(\x0cB\0\x12\x18\n\x0econsensus_hash\x18\x0c\x20\x01(\x0cB\0\ - \x12\x12\n\x08app_hash\x18\r\x20\x01(\x0cB\0\x12\x1b\n\x11last_results_h\ - ash\x18\x0e\x20\x01(\x0cB\0\x12\x17\n\revidence_hash\x18\x0f\x20\x01(\ - \x0cB\0\x12\x1a\n\x10proposer_address\x18\x10\x20\x01(\x0cB\0:\0\"+\n\ - \x07Version\x12\x0f\n\x05Block\x18\x01\x20\x01(\x04B\0\x12\r\n\x03App\ - \x18\x02\x20\x01(\x04B\0:\0\"L\n\x07BlockID\x12\x0e\n\x04hash\x18\x01\ - \x20\x01(\x0cB\0\x12/\n\x0cparts_header\x18\x02\x20\x01(\x0b2\x13.abci.P\ - artSetHeaderB\x04\xc8\xde\x1f\0:\0\"2\n\rPartSetHeader\x12\x0f\n\x05tota\ - l\x18\x01\x20\x01(\x05B\0\x12\x0e\n\x04hash\x18\x02\x20\x01(\x0cB\0:\0\"\ - 1\n\tValidator\x12\x11\n\x07address\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\ - \x05power\x18\x03\x20\x01(\x03B\0:\0\"I\n\x0fValidatorUpdate\x12#\n\x07p\ - ub_key\x18\x01\x20\x01(\x0b2\x0c.abci.PubKeyB\x04\xc8\xde\x1f\0\x12\x0f\ - \n\x05power\x18\x02\x20\x01(\x03B\0:\0\"S\n\x08VoteInfo\x12(\n\tvalidato\ - r\x18\x01\x20\x01(\x0b2\x0f.abci.ValidatorB\x04\xc8\xde\x1f\0\x12\x1b\n\ - \x11signed_last_block\x18\x02\x20\x01(\x08B\0:\0\"*\n\x06PubKey\x12\x0e\ - \n\x04type\x18\x01\x20\x01(\tB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\ - \0:\0\"\xaa\x01\n\x08Evidence\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\ - \x12(\n\tvalidator\x18\x02\x20\x01(\x0b2\x0f.abci.ValidatorB\x04\xc8\xde\ - \x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\x122\n\x04time\x18\ - \x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\xc8\xde\x1f\0\x90\ - \xdf\x1f\x01\x12\x1c\n\x12total_voting_power\x18\x05\x20\x01(\x03B\0:\0B\ - \x1c\xd0\xe2\x1e\x01\xf8\xe1\x1e\x01\xb8\xe2\x1e\x01\xc8\xe2\x1e\x01\xe0\ - \xe2\x1e\x01\xc0\xe3\x1e\x01\xa8\xe2\x1e\x01b\x06proto3\ + \x03(\x0b2\x0e.abci.VoteInfoB\x04\xc8\xde\x1f\0:\0\"[\n\x05Event\x12\x0e\ + \n\x04type\x18\x01\x20\x01(\tB\0\x12@\n\nattributes\x18\x02\x20\x03(\x0b\ + 2\x0e.common.KVPairB\x1c\xea\xde\x1f\x14attributes,omitempty\xc8\xde\x1f\ + \0:\0\"\xd5\x03\n\x06Header\x12$\n\x07version\x18\x01\x20\x01(\x0b2\r.ab\ + ci.VersionB\x04\xc8\xde\x1f\0\x12\x1d\n\x08chain_id\x18\x02\x20\x01(\tB\ + \x0b\xe2\xde\x1f\x07ChainID\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ + \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ + \xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03\ + B\0\x12\x13\n\ttotal_txs\x18\x06\x20\x01(\x03B\0\x12*\n\rlast_block_id\ + \x18\x07\x20\x01(\x0b2\r.abci.BlockIDB\x04\xc8\xde\x1f\0\x12\x1a\n\x10la\ + st_commit_hash\x18\x08\x20\x01(\x0cB\0\x12\x13\n\tdata_hash\x18\t\x20\ + \x01(\x0cB\0\x12\x19\n\x0fvalidators_hash\x18\n\x20\x01(\x0cB\0\x12\x1e\ + \n\x14next_validators_hash\x18\x0b\x20\x01(\x0cB\0\x12\x18\n\x0econsensu\ + s_hash\x18\x0c\x20\x01(\x0cB\0\x12\x12\n\x08app_hash\x18\r\x20\x01(\x0cB\ + \0\x12\x1b\n\x11last_results_hash\x18\x0e\x20\x01(\x0cB\0\x12\x17\n\revi\ + dence_hash\x18\x0f\x20\x01(\x0cB\0\x12\x1a\n\x10proposer_address\x18\x10\ + \x20\x01(\x0cB\0:\0\"+\n\x07Version\x12\x0f\n\x05Block\x18\x01\x20\x01(\ + \x04B\0\x12\r\n\x03App\x18\x02\x20\x01(\x04B\0:\0\"L\n\x07BlockID\x12\ + \x0e\n\x04hash\x18\x01\x20\x01(\x0cB\0\x12/\n\x0cparts_header\x18\x02\ + \x20\x01(\x0b2\x13.abci.PartSetHeaderB\x04\xc8\xde\x1f\0:\0\"2\n\rPartSe\ + tHeader\x12\x0f\n\x05total\x18\x01\x20\x01(\x05B\0\x12\x0e\n\x04hash\x18\ + \x02\x20\x01(\x0cB\0:\0\"1\n\tValidator\x12\x11\n\x07address\x18\x01\x20\ + \x01(\x0cB\0\x12\x0f\n\x05power\x18\x03\x20\x01(\x03B\0:\0\"I\n\x0fValid\ + atorUpdate\x12#\n\x07pub_key\x18\x01\x20\x01(\x0b2\x0c.abci.PubKeyB\x04\ + \xc8\xde\x1f\0\x12\x0f\n\x05power\x18\x02\x20\x01(\x03B\0:\0\"S\n\x08Vot\ + eInfo\x12(\n\tvalidator\x18\x01\x20\x01(\x0b2\x0f.abci.ValidatorB\x04\ + \xc8\xde\x1f\0\x12\x1b\n\x11signed_last_block\x18\x02\x20\x01(\x08B\0:\0\ + \"*\n\x06PubKey\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\x0e\n\x04dat\ + a\x18\x02\x20\x01(\x0cB\0:\0\"\xaa\x01\n\x08Evidence\x12\x0e\n\x04type\ + \x18\x01\x20\x01(\tB\0\x12(\n\tvalidator\x18\x02\x20\x01(\x0b2\x0f.abci.\ + ValidatorB\x04\xc8\xde\x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ + \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ + \x90\xdf\x1f\x01\xc8\xde\x1f\0\x12\x1c\n\x12total_voting_power\x18\x05\ + \x20\x01(\x03B\0:\0B\x1c\xa8\xe2\x1e\x01\xf8\xe1\x1e\x01\xc8\xe2\x1e\x01\ + \xb8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\x01\xd0\xe2\x1e\x01b\x06pro\ + to3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/merkle.rs b/src/messages/merkle.rs index ed81e6f..114d2c4 100644 --- a/src/messages/merkle.rs +++ b/src/messages/merkle.rs @@ -455,8 +455,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ rkle\":\n\x07ProofOp\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\r\n\x03\ key\x18\x02\x20\x01(\x0cB\0\x12\x0e\n\x04data\x18\x03\x20\x01(\x0cB\0:\0\ \"-\n\x05Proof\x12\"\n\x03ops\x18\x01\x20\x03(\x0b2\x0f.merkle.ProofOpB\ - \x04\xc8\xde\x1f\0:\0B\x14\xc8\xe2\x1e\x01\xa8\xe2\x1e\x01\xe0\xe2\x1e\ - \x01\xf8\xe1\x1e\x01\xd0\xe2\x1e\x01b\x06proto3\ + \x04\xc8\xde\x1f\0:\0B\x14\xf8\xe1\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\ + \x01\xa8\xe2\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/types.rs b/src/messages/types.rs index 8352a27..e07885e 100644 --- a/src/messages/types.rs +++ b/src/messages/types.rs @@ -441,7 +441,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ n\"*\n\x06KVPair\x12\r\n\x03key\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\x05val\ ue\x18\x02\x20\x01(\x0cB\0:\0\",\n\x08KI64Pair\x12\r\n\x03key\x18\x01\ \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xf8\ - \xe1\x1e\x01\xb8\xe2\x1e\x01\xc0\xe3\x1e\x01\xd0\xe2\x1e\x01\xa8\xe2\x1e\ + \xe1\x1e\x01\xa8\xe2\x1e\x01\xc0\xe3\x1e\x01\xb8\xe2\x1e\x01\xd0\xe2\x1e\ \x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ "; diff --git a/version.txt b/version.txt index 9001fab..9b27262 100644 --- a/version.txt +++ b/version.txt @@ -1,6 +1,6 @@ Version string = TMCoreSemVer // TMCoreSemVer is the current version of Tendermint Core. - TMCoreSemVer = "0.31.5" + TMCoreSemVer = "0.32.0" // ABCISemVer is the semantic version of the ABCI library ABCISemVer = "0.16.0" ABCIVersion = ABCISemVer From 99d72db1398590af956b30304e7e709463e3b972 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 8 Jul 2019 03:12:48 +0200 Subject: [PATCH 03/10] Compatibility Table, Fix link in toml (#81) - Added table for compatiblity - fix link in toml - homepage link closes #58 & #74 Signed-off-by: Marko Baricevic --- Cargo.toml | 2 +- README.md | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a4429d1..e028480 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "0.6.0" authors = ["Adrian Brink ", "Jackson Lewis ", "Dave Bryson", "Tomas Tauber"] license = "MIT/Apache-2.0" description = "Tendermint ABCI server for Rust" -homepage = "https://tendermint.com/docs/guides/app-development" +homepage = "https://tendermint.com/docs/spec/abci/" repository = "https://github.com/tendermint/rust-abci" keywords = ["abci", "tendermint", "blockchain", "rust"] readme = "README.md" diff --git a/README.md b/README.md index f758967..9656932 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Tendermint ABCI server, written in Rust programming language. [![Current Version](https://meritbadge.herokuapp.com/abci)](https://crates.io/crates/abci) -[![](https://tokei.rs/b1/github/tendermint/rust-abci)](https://github.com/tendermint/rust-abci) +[![](https://tokei.rs/b1/github/tendermint/rust-abci)](https://github.com/tendermint/rust-abci) [![CircleCI](https://circleci.com/gh/tendermint/rust-abci/tree/master.svg?style=shield)](https://circleci.com/gh/tendermint/rust-abci/tree/master) This library implements the [ABCI @@ -11,6 +11,7 @@ protocol](https://tendermint.com/docs/spec/abci/) and can be used to write ABCI applications for [Tendermint](https://github.com/tendermint/tendermint/). ## Supported Version + - Tendermint 0.32.0 - ABCI 0.16.0 @@ -32,12 +33,12 @@ To use this library to build your own ABCI apps in Rust you have to include the ```toml [dependencies] -abci = "0.4.3" +abci = "0.6.0" ``` ### Development -This crate already contains the compiled ABCI protobuf messages. If you want to update protobuf messages to a newer version of Tendermint. Run `make update-proto` +This crate already contains the compiled ABCI protobuf messages. If you want to update protobuf messages to a newer version of Tendermint. Run `make update-proto` ## Running the examples @@ -60,6 +61,13 @@ curl localhost:26657/broadcast_tx_commit?tx=0x02 For a real life example of an ABCI application you can checkout [Cosmos SDK](https://github.com/cosmos/cosmos-sdk) or [Ethermint](https://github.com/cosmos/ethermint). +#### Tendermint Compatibility Table + +| Tendermint | Rust-abci | +| ---------- | :-------: | +| 0.32 | 0.6.0 | +| 0.31.7 | 0.5.4 | + ## Documentation Coming soon! From b01994e738765463c7917c08384d28c48ca7ff11 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 8 Jul 2019 03:17:47 +0200 Subject: [PATCH 04/10] Reduce amount of logs under `info` (#80) closes #78 - Reduce amount of logs to clean up terminal if just running the abci server Signed-off-by: Marko Baricevic --- src/server.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.rs b/src/server.rs index d00fb23..1bedc18 100644 --- a/src/server.rs +++ b/src/server.rs @@ -33,12 +33,12 @@ where let app_instance = Arc::clone(&app); let responses = reader.map(move |request| { - info!("Got Request! {:?}", request); + debug!("Got Request! {:?}", request); respond(&app_instance, &request) }); let writes = responses.fold(_writer, |writer, response| { - info!("Return Response! {:?}", response); + debug!("Return Response! {:?}", response); writer.send(response) }); tokio::spawn(writes.then(|_| Ok(()))) From 53b75f16cddaf1ce0efd7fc1e8ae116170494d28 Mon Sep 17 00:00:00 2001 From: Marko Date: Thu, 22 Aug 2019 10:43:15 +0200 Subject: [PATCH 05/10] Add changelog (#82) * Add changelog - Added a Changelog closes #65 Signed-off-by: Marko Baricevic --- CHANGELOG.md | 15 ++++++++++ CONTRIBUTING.md | 74 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8da4d4d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,15 @@ +# CHANGELOG + +\*\* + +Special thanks to external contributors on this release: + +## Release: + +### BREAKING CHANGES: + +### FEATURES: + +### IMPROVEMENTS: + +### BUG FIXES: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 331678a..fceadc3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,64 +4,96 @@ Thank you for taking the time to contribute to our organization and this reposit Please follow standard github best practices: fork the repo, branch from the tip of develop, make some commits, and submit a pull request to develop. See the open (issues)[https://github.com/tendermint/rust-abci/issues] for things to contribute. -## Code of Conduct +## Code of Conduct + --- + All contributors are expected to follow (Code of Conduct)[./CODE_OF_CONDUCT.md] ## Feature requests and bug reports ---- + +--- + Feature requests or bug reports can be posted as a (Github issue)[https://github.com/tendermint/rust-abci/issues/new]. In the issue, please follow the template and describe to the best of your ability what you did, what you expected and what happened instead. If you'd like to solve a issue, please comment that you would like to claim the issue. This makes sure that no one else will work on it. ## Forking + --- Once you have a issue that you would to work on and commented on it to claim it: -* Fork the repository to your Github account. -* Clone your fork to your local machine -* Create a local branch `git checkout -b `. -* Commit & push your changes to your branch on github. -* Make sure that you are working off the most recent version, if not, pull the develop branch and rebase your committed history. -* Before opening a pull request read the [development section](#development) -* Open a [Pull Request](#pull-requests) for others to review the branch. - +- Fork the repository to your Github account. +- Clone your fork to your local machine +- Create a local branch `git checkout -b `. +- Commit & push your changes to your branch on github. +- Make sure that you are working off the most recent version, if not, pull the develop branch and rebase your committed history. +- Before opening a pull request read the [development section](#development) +- Open a [Pull Request](#pull-requests) for others to review the branch. ## Pull Requests + --- -To accommodate review process we suggest that PRs are categorically broken up. Ideally each PR addresses only a single issue. Additionally, as much as possible code refactoring and cleanup should be submitted as a separate PRs from bugfixes/feature-additions. +To accommodate review process we suggest that PRs are categorically broken up. Ideally each PR addresses only a single issue. Additionally, as much as possible code refactoring and cleanup should be submitted as a separate PRs from bugfixes/feature-additions. -If you are working on a issue and plan on contributing, please submit your PR early and make sure its opened as a `Draft`, even if it's incomplete, this indicates to the community you're working on something and allows them to provide comments early in the development process. When the code is complete it should be marked using Github's `Mark Ready` feature. This will let the maintainers know that there is a open PR for review. +If you are working on a issue and plan on contributing, please submit your PR early and make sure its opened as a `Draft`, even if it's incomplete, this indicates to the community you're working on something and allows them to provide comments early in the development process. When the code is complete it should be marked using Github's `Mark Ready` feature. This will let the maintainers know that there is a open PR for review. ## Development + --- -The code should follow [Rust Style Guide](https://github.com/rust-lang/rfcs/tree/master/style-guide). Much of the code style is captured by `rustfmt`. +The code should follow [Rust Style Guide](https://github.com/rust-lang/rfcs/tree/master/style-guide). Much of the code style is captured by `rustfmt`. Before opening a Pull Request please run the checks below: -* Install rustfmt: `rustup component add rustfmt` -* Install clippy: `rustup component add clippy` +- Install rustfmt: `rustup component add rustfmt` +- Install clippy: `rustup component add clippy` -### Testing +### Testing -Run the test suite with +Run the test suite with -```cargo test --all-features``` +`cargo test --all-features` ### Format checking (rustfmt) Make sure your code is well-formatted by running -```cargo fmt``` +`cargo fmt` ### Lint (clippy) Lint your code (i.e. check it for common issues) with: -```cargo clippy``` +`cargo clippy` + +## Changelog + +Every fix, improvement, feature, or breaking change should be made in a +pull-request that includes an update to the `CHANGELOG.md` file. + +Changelog entries should be formatted as follows: + +``` +- \#xxx Some description about the change (@contributor) +``` + +Here, `xxx` is the pull-request number, and `contributor` +is the author/s of the change. + +It's also acceptable for `xxx` to refer to the relevent issue number, but pull-request +numbers are preferred. +Note this means pull-requests should be opened first so the changelog can then +be updated with the pull-request's number. +There is no need to include the full link, as this will be added +automatically during release. But please include the backslash and pound, eg. `\#2313`. + +Changelog entries should be numerically according to the pull-request number. + +Changes with multiple classifications should be doubly included (eg. a bug fix +that is also a breaking change should be recorded under both). ## License @@ -77,4 +109,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. From fa46982faa5ec7c848a1f87c1c6dd1fe0a805503 Mon Sep 17 00:00:00 2001 From: Alex Manuskin Date: Fri, 23 Aug 2019 05:05:23 +0300 Subject: [PATCH 06/10] Fix dynamic trait warning (#84) Update protobuf to 2.8 --- Cargo.toml | 4 +- src/codec.rs | 12 +- src/messages/abci.rs | 453 +++++++++++++++++++++-------------------- src/messages/merkle.rs | 33 +-- src/messages/types.rs | 35 ++-- 5 files changed, 276 insertions(+), 261 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e028480..5cdec63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ include = ["src/**/*", "Cargo.toml"] [dependencies] bytes = "0.4" -protobuf = "2.6.2" +protobuf = "2.8" byteorder = "1.2.7" integer-encoding = "1.0.5" log = "0.4.6" @@ -21,4 +21,4 @@ tokio = "0.1" futures = "0.1" [build-dependencies] -protobuf-codegen-pure = "2.6.2" +protobuf-codegen-pure = "2.8" diff --git a/src/codec.rs b/src/codec.rs index 3c963c0..8ce849f 100644 --- a/src/codec.rs +++ b/src/codec.rs @@ -18,9 +18,9 @@ impl ABCICodec { impl Decoder for ABCICodec { type Item = Request; - type Error = Box; + type Error = Box; - fn decode(&mut self, buf: &mut BytesMut) -> Result, Box> { + fn decode(&mut self, buf: &mut BytesMut) -> Result, Box> { let length = buf.len(); if length == 0 { return Ok(None); @@ -37,9 +37,9 @@ impl Decoder for ABCICodec { impl Encoder for ABCICodec { type Item = Response; - type Error = Box; + type Error = Box; - fn encode(&mut self, msg: Response, buf: &mut BytesMut) -> Result<(), Box> { + fn encode(&mut self, msg: Response, buf: &mut BytesMut) -> Result<(), Box> { let msg_len = msg.compute_size(); let varint = i64::encode_var_vec(i64::from(msg_len)); @@ -60,7 +60,7 @@ impl Encoder for ABCICodec { mod tests { use super::*; - fn setup_echo_request_buf() -> Result> { + fn setup_echo_request_buf() -> Result> { let buf = &mut BytesMut::new(); let mut r = Request::new(); @@ -78,7 +78,7 @@ mod tests { Ok(buf.take()) } - fn setup_echo_large_request_buf() -> Result> { + fn setup_echo_large_request_buf() -> Result> { let buf = &mut BytesMut::new(); let mut r = Request::new(); diff --git a/src/messages/abci.rs b/src/messages/abci.rs index 1c18e19..495b788 100644 --- a/src/messages/abci.rs +++ b/src/messages/abci.rs @@ -1,9 +1,9 @@ -// This file is generated by rust-protobuf 2.6.2. Do not edit +// This file is generated by rust-protobuf 2.8.0. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 #![allow(unknown_lints)] -#![allow(clippy)] +#![allow(clippy::all)] #![cfg_attr(rustfmt, rustfmt_skip)] @@ -17,10 +17,15 @@ #![allow(unsafe_code)] #![allow(unused_imports)] #![allow(unused_results)] +//! Generated file from `abci.proto` use protobuf::Message as Message_imported_for_functions; use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; +/// Generated files are compatible only with the same version +/// of protobuf runtime. +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; + #[derive(PartialEq,Clone,Default)] pub struct Request { // message oneof groups @@ -867,13 +872,13 @@ impl ::protobuf::Message for Request { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -1096,13 +1101,13 @@ impl ::protobuf::Message for RequestEcho { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -1228,13 +1233,13 @@ impl ::protobuf::Message for RequestFlush { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -1449,13 +1454,13 @@ impl ::protobuf::Message for RequestInfo { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -1666,13 +1671,13 @@ impl ::protobuf::Message for RequestSetOption { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -2022,13 +2027,13 @@ impl ::protobuf::Message for RequestInitChain { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -2309,13 +2314,13 @@ impl ::protobuf::Message for RequestQuery { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -2641,13 +2646,13 @@ impl ::protobuf::Message for RequestBeginBlock { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -2828,13 +2833,13 @@ impl ::protobuf::Message for RequestCheckTx { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -2997,13 +3002,13 @@ impl ::protobuf::Message for RequestDeliverTx { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -3159,13 +3164,13 @@ impl ::protobuf::Message for RequestEndBlock { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -3291,13 +3296,13 @@ impl ::protobuf::Message for RequestCommit { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -4271,13 +4276,13 @@ impl ::protobuf::Message for Response { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -4506,13 +4511,13 @@ impl ::protobuf::Message for ResponseException { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -4675,13 +4680,13 @@ impl ::protobuf::Message for ResponseEcho { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -4807,13 +4812,13 @@ impl ::protobuf::Message for ResponseFlush { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -5100,13 +5105,13 @@ impl ::protobuf::Message for ResponseInfo { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -5358,13 +5363,13 @@ impl ::protobuf::Message for ResponseSetOption { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -5597,13 +5602,13 @@ impl ::protobuf::Message for ResponseInitChain { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -6054,13 +6059,13 @@ impl ::protobuf::Message for ResponseQuery { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -6278,13 +6283,13 @@ impl ::protobuf::Message for ResponseBeginBlock { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -6685,13 +6690,13 @@ impl ::protobuf::Message for ResponseCheckTx { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -7134,13 +7139,13 @@ impl ::protobuf::Message for ResponseDeliverTx { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -7446,13 +7451,13 @@ impl ::protobuf::Message for ResponseEndBlock { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -7627,13 +7632,13 @@ impl ::protobuf::Message for ResponseCommit { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -7913,13 +7918,13 @@ impl ::protobuf::Message for ConsensusParams { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -8116,13 +8121,13 @@ impl ::protobuf::Message for BlockParams { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -8284,13 +8289,13 @@ impl ::protobuf::Message for EvidenceParams { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -8452,13 +8457,13 @@ impl ::protobuf::Message for ValidatorParams { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -8657,13 +8662,13 @@ impl ::protobuf::Message for LastCommitInfo { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -8875,13 +8880,13 @@ impl ::protobuf::Message for Event { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -9614,13 +9619,13 @@ impl ::protobuf::Message for Header { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -9895,13 +9900,13 @@ impl ::protobuf::Message for Version { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -10121,13 +10126,13 @@ impl ::protobuf::Message for BlockID { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -10325,13 +10330,13 @@ impl ::protobuf::Message for PartSetHeader { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -10529,13 +10534,13 @@ impl ::protobuf::Message for Validator { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -10748,13 +10753,13 @@ impl ::protobuf::Message for ValidatorUpdate { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -10967,13 +10972,13 @@ impl ::protobuf::Message for VoteInfo { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -11178,13 +11183,13 @@ impl ::protobuf::Message for PubKey { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -11513,13 +11518,13 @@ impl ::protobuf::Message for Evidence { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -11671,24 +11676,24 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x01(\x0cB\0\x12\x1e\n\x05proof\x18\x08\x20\x01(\x0b2\r.merkle.ProofB\0\ \x12\x10\n\x06height\x18\t\x20\x01(\x03B\0\x12\x13\n\tcodespace\x18\n\ \x20\x01(\tB\0:\0\"M\n\x12ResponseBeginBlock\x125\n\x06events\x18\x01\ - \x20\x03(\x0b2\x0b.abci.EventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,o\ - mitempty:\0\"\xc8\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ - \x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\x18\ - \x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\nga\ - s_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\x01(\ - \x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\x18\xc8\ - \xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\x18\x08\ - \x20\x01(\tB\0:\0\"\xca\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\x18\ - \x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03\ - log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\ - \x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\ - \x20\x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\ - \x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\ - \x18\x08\x20\x01(\tB\0:\0\"\xbd\x01\n\x10ResponseEndBlock\x126\n\x11vali\ - dator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ + \x20\x03(\x0b2\x0b.abci.EventB\x18\xea\xde\x1f\x10events,omitempty\xc8\ + \xde\x1f\0:\0\"\xc8\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\ + \x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\ + \x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\ + \ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\ + \x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\x18\ + \xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\x18\ + \x08\x20\x01(\tB\0:\0\"\xca\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\ + \x18\x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\ + \x03log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\ + \x12\x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\ + \x06\x20\x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.Eve\ + ntB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespa\ + ce\x18\x08\x20\x01(\tB\0:\0\"\xbd\x01\n\x10ResponseEndBlock\x126\n\x11va\ + lidator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ \xde\x1f\0\x128\n\x17consensus_param_updates\x18\x02\x20\x01(\x0b2\x15.a\ bci.ConsensusParamsB\0\x125\n\x06events\x18\x03\x20\x03(\x0b2\x0b.abci.E\ - ventB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0:\0\"\"\n\x0eResp\ + ventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty:\0\"\"\n\x0eResp\ onseCommit\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0:\0\"\x8d\x01\n\x0fC\ onsensusParams\x12\"\n\x05block\x18\x01\x20\x01(\x0b2\x11.abci.BlockPara\ msB\0\x12(\n\x08evidence\x18\x02\x20\x01(\x0b2\x14.abci.EvidenceParamsB\ @@ -11700,12 +11705,12 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x0f\n\x05round\x18\x01\x20\x01(\x05B\0\x12#\n\x05votes\x18\x02\x20\ \x03(\x0b2\x0e.abci.VoteInfoB\x04\xc8\xde\x1f\0:\0\"[\n\x05Event\x12\x0e\ \n\x04type\x18\x01\x20\x01(\tB\0\x12@\n\nattributes\x18\x02\x20\x03(\x0b\ - 2\x0e.common.KVPairB\x1c\xea\xde\x1f\x14attributes,omitempty\xc8\xde\x1f\ - \0:\0\"\xd5\x03\n\x06Header\x12$\n\x07version\x18\x01\x20\x01(\x0b2\r.ab\ + 2\x0e.common.KVPairB\x1c\xc8\xde\x1f\0\xea\xde\x1f\x14attributes,omitemp\ + ty:\0\"\xd5\x03\n\x06Header\x12$\n\x07version\x18\x01\x20\x01(\x0b2\r.ab\ ci.VersionB\x04\xc8\xde\x1f\0\x12\x1d\n\x08chain_id\x18\x02\x20\x01(\tB\ \x0b\xe2\xde\x1f\x07ChainID\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ - \xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03\ + \x90\xdf\x1f\x01\xc8\xde\x1f\0\x12\x11\n\x07num_txs\x18\x05\x20\x01(\x03\ B\0\x12\x13\n\ttotal_txs\x18\x06\x20\x01(\x03B\0\x12*\n\rlast_block_id\ \x18\x07\x20\x01(\x0b2\r.abci.BlockIDB\x04\xc8\xde\x1f\0\x12\x1a\n\x10la\ st_commit_hash\x18\x08\x20\x01(\x0cB\0\x12\x13\n\tdata_hash\x18\t\x20\ @@ -11730,9 +11735,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x01\x20\x01(\tB\0\x12(\n\tvalidator\x18\x02\x20\x01(\x0b2\x0f.abci.\ ValidatorB\x04\xc8\xde\x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ - \x90\xdf\x1f\x01\xc8\xde\x1f\0\x12\x1c\n\x12total_voting_power\x18\x05\ - \x20\x01(\x03B\0:\0B\x1c\xa8\xe2\x1e\x01\xf8\xe1\x1e\x01\xc8\xe2\x1e\x01\ - \xb8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\x01\xd0\xe2\x1e\x01b\x06pro\ + \xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x1c\n\x12total_voting_power\x18\x05\ + \x20\x01(\x03B\0:\0B\x1c\xb8\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01\ + \xa8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01b\x06pro\ to3\ "; diff --git a/src/messages/merkle.rs b/src/messages/merkle.rs index 114d2c4..102ae15 100644 --- a/src/messages/merkle.rs +++ b/src/messages/merkle.rs @@ -1,9 +1,9 @@ -// This file is generated by rust-protobuf 2.6.2. Do not edit +// This file is generated by rust-protobuf 2.8.0. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 #![allow(unknown_lints)] -#![allow(clippy)] +#![allow(clippy::all)] #![cfg_attr(rustfmt, rustfmt_skip)] @@ -17,10 +17,15 @@ #![allow(unsafe_code)] #![allow(unused_imports)] #![allow(unused_results)] +//! Generated file from `github.com/tendermint/tendermint/crypto/merkle/merkle.proto` use protobuf::Message as Message_imported_for_functions; use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; +/// Generated files are compatible only with the same version +/// of protobuf runtime. +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; + #[derive(PartialEq,Clone,Default)] pub struct ProofOp { // message fields @@ -192,13 +197,13 @@ impl ::protobuf::Message for ProofOp { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -380,13 +385,13 @@ impl ::protobuf::Message for Proof { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -455,8 +460,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ rkle\":\n\x07ProofOp\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\r\n\x03\ key\x18\x02\x20\x01(\x0cB\0\x12\x0e\n\x04data\x18\x03\x20\x01(\x0cB\0:\0\ \"-\n\x05Proof\x12\"\n\x03ops\x18\x01\x20\x03(\x0b2\x0f.merkle.ProofOpB\ - \x04\xc8\xde\x1f\0:\0B\x14\xf8\xe1\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\ - \x01\xa8\xe2\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ + \x04\xc8\xde\x1f\0:\0B\x14\xd0\xe2\x1e\x01\xf8\xe1\x1e\x01\xa8\xe2\x1e\ + \x01\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/types.rs b/src/messages/types.rs index e07885e..d5bb847 100644 --- a/src/messages/types.rs +++ b/src/messages/types.rs @@ -1,9 +1,9 @@ -// This file is generated by rust-protobuf 2.6.2. Do not edit +// This file is generated by rust-protobuf 2.8.0. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 #![allow(unknown_lints)] -#![allow(clippy)] +#![allow(clippy::all)] #![cfg_attr(rustfmt, rustfmt_skip)] @@ -17,10 +17,15 @@ #![allow(unsafe_code)] #![allow(unused_imports)] #![allow(unused_results)] +//! Generated file from `github.com/tendermint/tendermint/libs/common/types.proto` use protobuf::Message as Message_imported_for_functions; use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; +/// Generated files are compatible only with the same version +/// of protobuf runtime. +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; + #[derive(PartialEq,Clone,Default)] pub struct KVPair { // message fields @@ -156,13 +161,13 @@ impl ::protobuf::Message for KVPair { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -360,13 +365,13 @@ impl ::protobuf::Message for KI64Pair { &mut self.unknown_fields } - fn as_any(&self) -> &::std::any::Any { - self as &::std::any::Any + fn as_any(&self) -> &dyn (::std::any::Any) { + self as &dyn (::std::any::Any) } - fn as_any_mut(&mut self) -> &mut ::std::any::Any { - self as &mut ::std::any::Any + fn as_any_mut(&mut self) -> &mut dyn (::std::any::Any) { + self as &mut dyn (::std::any::Any) } - fn into_any(self: Box) -> ::std::boxed::Box<::std::any::Any> { + fn into_any(self: Box) -> ::std::boxed::Box { self } @@ -440,9 +445,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \n8github.com/tendermint/tendermint/libs/common/types.proto\x12\x06commo\ n\"*\n\x06KVPair\x12\r\n\x03key\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\x05val\ ue\x18\x02\x20\x01(\x0cB\0:\0\",\n\x08KI64Pair\x12\r\n\x03key\x18\x01\ - \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xf8\ - \xe1\x1e\x01\xa8\xe2\x1e\x01\xc0\xe3\x1e\x01\xb8\xe2\x1e\x01\xd0\xe2\x1e\ - \x01\xe0\xe2\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ + \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xa8\ + \xe2\x1e\x01\xd0\xe2\x1e\x01\xb8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\ + \x01\xf8\xe1\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { From 9ef789b018ab2350aed64c156f0502b2621b85a8 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Fri, 23 Aug 2019 10:32:39 +0800 Subject: [PATCH 07/10] Release/v0.6.1 (#85) * updated cargo + changelog * Fix edition + bump dependencies --- CHANGELOG.md | 26 +++++++++++++++++++++++--- Cargo.toml | 9 +++++---- src/codec.rs | 2 +- src/lib.rs | 8 ++++---- src/messages/abci.rs | 36 ++++++++++++++++++------------------ src/messages/merkle.rs | 4 ++-- src/messages/types.rs | 6 +++--- src/server.rs | 6 +++--- 8 files changed, 59 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8da4d4d..34ed9c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,10 @@ # CHANGELOG -\*\* +*August 23, 2019* -Special thanks to external contributors on this release: +Special thanks to external contributors on this release: @amanusk, @marbar3778 -## Release: +## v0.6.1 ### BREAKING CHANGES: @@ -12,4 +12,24 @@ Special thanks to external contributors on this release: ### IMPROVEMENTS: +- [\#84](https://github.com/tendermint/rust-abci/pull/84): Fix warning for dynamic trait objects + +- [\#80](https://github.com/tendermint/rust-abci/pull/80): Reduce amount of logs under `info` + +### BUG FIXES: + +*July 1, 2019* + +Special thanks to external contributors on this release: @liamsi + +## v0.6.0 + +### BREAKING CHANGES: + +- [\#79](https://github.com/tendermint/rust-abci/pull/79): Tendermint 0.32.*'s ABCI compatibility + +### FEATURES: + +### IMPROVEMENTS: + ### BUG FIXES: diff --git a/Cargo.toml b/Cargo.toml index 5cdec63..dec45ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "abci" -version = "0.6.0" +version = "0.6.1" authors = ["Adrian Brink ", "Jackson Lewis ", "Dave Bryson", "Tomas Tauber"] +edition = "2018" license = "MIT/Apache-2.0" description = "Tendermint ABCI server for Rust" homepage = "https://tendermint.com/docs/spec/abci/" @@ -13,10 +14,10 @@ include = ["src/**/*", "Cargo.toml"] [dependencies] bytes = "0.4" protobuf = "2.8" -byteorder = "1.2.7" +byteorder = "1.3.2" integer-encoding = "1.0.5" -log = "0.4.6" -env_logger = "0.6.1" +log = "0.4.8" +env_logger = "0.6.2" tokio = "0.1" futures = "0.1" diff --git a/src/codec.rs b/src/codec.rs index 8ce849f..b40ad75 100644 --- a/src/codec.rs +++ b/src/codec.rs @@ -5,7 +5,7 @@ use integer_encoding::VarInt; use protobuf::Message; use tokio::codec::{Decoder, Encoder}; -use messages::abci::*; +use crate::messages::abci::*; #[derive(Debug)] pub struct ABCICodec; diff --git a/src/lib.rs b/src/lib.rs index c23e0cf..880c348 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,10 +32,10 @@ extern crate tokio; use std::net::SocketAddr; -pub use messages::abci::*; -pub use messages::merkle::*; -pub use messages::types::*; -use server::serve; +pub use crate::messages::abci::*; +pub use crate::messages::merkle::*; +pub use crate::messages::types::*; +use crate::server::serve; mod codec; mod messages; diff --git a/src/messages/abci.rs b/src/messages/abci.rs index 495b788..3c400e9 100644 --- a/src/messages/abci.rs +++ b/src/messages/abci.rs @@ -11676,24 +11676,24 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x01(\x0cB\0\x12\x1e\n\x05proof\x18\x08\x20\x01(\x0b2\r.merkle.ProofB\0\ \x12\x10\n\x06height\x18\t\x20\x01(\x03B\0\x12\x13\n\tcodespace\x18\n\ \x20\x01(\tB\0:\0\"M\n\x12ResponseBeginBlock\x125\n\x06events\x18\x01\ - \x20\x03(\x0b2\x0b.abci.EventB\x18\xea\xde\x1f\x10events,omitempty\xc8\ - \xde\x1f\0:\0\"\xc8\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\ - \x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\ - \x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\ - \ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\ - \x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\x18\ - \xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty\x12\x13\n\tcodespace\x18\ - \x08\x20\x01(\tB\0:\0\"\xca\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\ - \x18\x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\ - \x03log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\ - \x12\x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\ - \x06\x20\x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.Eve\ - ntB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespa\ - ce\x18\x08\x20\x01(\tB\0:\0\"\xbd\x01\n\x10ResponseEndBlock\x126\n\x11va\ - lidator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ + \x20\x03(\x0b2\x0b.abci.EventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,o\ + mitempty:\0\"\xc8\x01\n\x0fResponseCheckTx\x12\x0e\n\x04code\x18\x01\x20\ + \x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03log\x18\ + \x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\x14\n\nga\ + s_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\x20\x01(\ + \x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\x18\xea\ + \xde\x1f\x10events,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\x18\x08\ + \x20\x01(\tB\0:\0\"\xca\x01\n\x11ResponseDeliverTx\x12\x0e\n\x04code\x18\ + \x01\x20\x01(\rB\0\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0\x12\r\n\x03\ + log\x18\x03\x20\x01(\tB\0\x12\x0e\n\x04info\x18\x04\x20\x01(\tB\0\x12\ + \x14\n\ngas_wanted\x18\x05\x20\x01(\x03B\0\x12\x12\n\x08gas_used\x18\x06\ + \x20\x01(\x03B\0\x125\n\x06events\x18\x07\x20\x03(\x0b2\x0b.abci.EventB\ + \x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0\x12\x13\n\tcodespace\ + \x18\x08\x20\x01(\tB\0:\0\"\xbd\x01\n\x10ResponseEndBlock\x126\n\x11vali\ + dator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ \xde\x1f\0\x128\n\x17consensus_param_updates\x18\x02\x20\x01(\x0b2\x15.a\ bci.ConsensusParamsB\0\x125\n\x06events\x18\x03\x20\x03(\x0b2\x0b.abci.E\ - ventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty:\0\"\"\n\x0eResp\ + ventB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0:\0\"\"\n\x0eResp\ onseCommit\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0:\0\"\x8d\x01\n\x0fC\ onsensusParams\x12\"\n\x05block\x18\x01\x20\x01(\x0b2\x11.abci.BlockPara\ msB\0\x12(\n\x08evidence\x18\x02\x20\x01(\x0b2\x14.abci.EvidenceParamsB\ @@ -11736,8 +11736,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ValidatorB\x04\xc8\xde\x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ \xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x1c\n\x12total_voting_power\x18\x05\ - \x20\x01(\x03B\0:\0B\x1c\xb8\xe2\x1e\x01\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01\ - \xa8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01b\x06pro\ + \x20\x01(\x03B\0:\0B\x1c\xe0\xe2\x1e\x01\xa8\xe2\x1e\x01\xd0\xe2\x1e\x01\ + \xc8\xe2\x1e\x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01\xb8\xe2\x1e\x01b\x06pro\ to3\ "; diff --git a/src/messages/merkle.rs b/src/messages/merkle.rs index 102ae15..5c47b31 100644 --- a/src/messages/merkle.rs +++ b/src/messages/merkle.rs @@ -460,8 +460,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ rkle\":\n\x07ProofOp\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\r\n\x03\ key\x18\x02\x20\x01(\x0cB\0\x12\x0e\n\x04data\x18\x03\x20\x01(\x0cB\0:\0\ \"-\n\x05Proof\x12\"\n\x03ops\x18\x01\x20\x03(\x0b2\x0f.merkle.ProofOpB\ - \x04\xc8\xde\x1f\0:\0B\x14\xd0\xe2\x1e\x01\xf8\xe1\x1e\x01\xa8\xe2\x1e\ - \x01\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01b\x06proto3\ + \x04\xc8\xde\x1f\0:\0B\x14\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01\xa8\xe2\x1e\ + \x01\xf8\xe1\x1e\x01\xe0\xe2\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/types.rs b/src/messages/types.rs index d5bb847..f54849f 100644 --- a/src/messages/types.rs +++ b/src/messages/types.rs @@ -445,9 +445,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \n8github.com/tendermint/tendermint/libs/common/types.proto\x12\x06commo\ n\"*\n\x06KVPair\x12\r\n\x03key\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\x05val\ ue\x18\x02\x20\x01(\x0cB\0:\0\",\n\x08KI64Pair\x12\r\n\x03key\x18\x01\ - \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xa8\ - \xe2\x1e\x01\xd0\xe2\x1e\x01\xb8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\ - \x01\xf8\xe1\x1e\x01\xc8\xe2\x1e\x01b\x06proto3\ + \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xb8\ + \xe2\x1e\x01\xe0\xe2\x1e\x01\xa8\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\ + \x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/server.rs b/src/server.rs index 1bedc18..0aba324 100644 --- a/src/server.rs +++ b/src/server.rs @@ -9,9 +9,9 @@ use tokio::io; use tokio::net::TcpListener; use tokio::prelude::*; -use codec::ABCICodec; -use messages::abci::*; -use Application; +use crate::codec::ABCICodec; +use crate::messages::abci::*; +use crate::Application; /// Creates the TCP server and listens for connections from Tendermint pub fn serve(app: A, addr: SocketAddr) -> io::Result<()> From 93b3ddc141b41d7f9f7e25e386ef2e681d2f5511 Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Fri, 23 Aug 2019 10:58:32 +0800 Subject: [PATCH 08/10] fix changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34ed9c2..5192a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ Special thanks to external contributors on this release: @liamsi ### BREAKING CHANGES: -- [\#79](https://github.com/tendermint/rust-abci/pull/79): Tendermint 0.32.*'s ABCI compatibility +- [\#79](https://github.com/tendermint/rust-abci/pull/79): Tendermint 0.32.\*'s ABCI compatibility ### FEATURES: From f2353b2c32103d0e514ba106f5f6d441502ef38c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Sep 2019 10:29:23 +0800 Subject: [PATCH 09/10] Update env_logger requirement from 0.6.2 to 0.7.0 (#88) Updates the requirements on [env_logger](https://github.com/sebasmagri/env_logger) to permit the latest version. - [Release notes](https://github.com/sebasmagri/env_logger/releases) - [Changelog](https://github.com/sebasmagri/env_logger/blob/master/CHANGELOG.md) - [Commits](https://github.com/sebasmagri/env_logger/compare/v0.6.2...v0.7.0) Signed-off-by: dependabot-preview[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index dec45ed..75ccafe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ protobuf = "2.8" byteorder = "1.3.2" integer-encoding = "1.0.5" log = "0.4.8" -env_logger = "0.6.2" +env_logger = "0.7.0" tokio = "0.1" futures = "0.1" From 998a9ff122d2d9793a90790ec1dbbeb026b269ad Mon Sep 17 00:00:00 2001 From: Tomas Tauber <2410580+tomtau@users.noreply.github.com> Date: Fri, 27 Sep 2019 00:43:14 +0800 Subject: [PATCH 10/10] Bumped version of protobuf to 2.8.1 -- fixes #87 (#89) * Bumped version of protobuf to 2.8.1 -- fixes #87 * updated readme --- CHANGELOG.md | 13 +++ Cargo.toml | 6 +- README.md | 4 +- src/messages/abci.rs | 252 ++++++++++++++++++++--------------------- src/messages/merkle.rs | 20 ++-- src/messages/types.rs | 22 ++-- 6 files changed, 165 insertions(+), 152 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5192a81..bf9389a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # CHANGELOG +*September 25, 2019* + +## v0.6.2 + +### BREAKING CHANGES: + +### FEATURES: + +### IMPROVEMENTS: + +### BUG FIXES: +- [\#87](https://github.com/tendermint/rust-abci/issues/87): Version of protobuf specified to the latest one (2.8.1) + *August 23, 2019* Special thanks to external contributors on this release: @amanusk, @marbar3778 diff --git a/Cargo.toml b/Cargo.toml index 75ccafe..6c639f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "abci" -version = "0.6.1" +version = "0.6.2" authors = ["Adrian Brink ", "Jackson Lewis ", "Dave Bryson", "Tomas Tauber"] edition = "2018" license = "MIT/Apache-2.0" @@ -13,7 +13,7 @@ include = ["src/**/*", "Cargo.toml"] [dependencies] bytes = "0.4" -protobuf = "2.8" +protobuf = "2.8.1" byteorder = "1.3.2" integer-encoding = "1.0.5" log = "0.4.8" @@ -22,4 +22,4 @@ tokio = "0.1" futures = "0.1" [build-dependencies] -protobuf-codegen-pure = "2.8" +protobuf-codegen-pure = "2.8.1" diff --git a/README.md b/README.md index 3cd8c2a..9fba55b 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ To use this library to build your own ABCI apps in Rust you have to include the ```toml [dependencies] -abci = "0.6.1" +abci = "0.6.2" ``` ### Development @@ -64,7 +64,7 @@ For a real life example of an ABCI application you can checkout [Cosmos SDK](htt | Tendermint | Rust-abci | | ---------- | :-------: | -| 0.32.2 | 0.6.1 | +| 0.32.2 | 0.6.2 | | 0.31.7 | 0.5.4 | ## Documentation diff --git a/src/messages/abci.rs b/src/messages/abci.rs index 3c400e9..66d2def 100644 --- a/src/messages/abci.rs +++ b/src/messages/abci.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.8.0. Do not edit +// This file is generated by rust-protobuf 2.8.1. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; #[derive(PartialEq,Clone,Default)] pub struct Request { @@ -661,7 +661,7 @@ impl ::protobuf::Message for Request { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -796,7 +796,7 @@ impl ::protobuf::Message for Request { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let ::std::option::Option::Some(ref v) = self.value { match v { &Request_oneof_value::echo(ref v) => { @@ -991,7 +991,7 @@ impl ::protobuf::Clear for Request { } impl ::std::fmt::Debug for Request { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -1054,7 +1054,7 @@ impl ::protobuf::Message for RequestEcho { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -1081,7 +1081,7 @@ impl ::protobuf::Message for RequestEcho { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.message.is_empty() { os.write_string(1, &self.message)?; } @@ -1160,7 +1160,7 @@ impl ::protobuf::Clear for RequestEcho { } impl ::std::fmt::Debug for RequestEcho { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -1195,7 +1195,7 @@ impl ::protobuf::Message for RequestFlush { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -1216,7 +1216,7 @@ impl ::protobuf::Message for RequestFlush { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1286,7 +1286,7 @@ impl ::protobuf::Clear for RequestFlush { } impl ::std::fmt::Debug for RequestFlush { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -1381,7 +1381,7 @@ impl ::protobuf::Message for RequestInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -1428,7 +1428,7 @@ impl ::protobuf::Message for RequestInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.version.is_empty() { os.write_string(1, &self.version)?; } @@ -1525,7 +1525,7 @@ impl ::protobuf::Clear for RequestInfo { } impl ::std::fmt::Debug for RequestInfo { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -1615,7 +1615,7 @@ impl ::protobuf::Message for RequestSetOption { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -1648,7 +1648,7 @@ impl ::protobuf::Message for RequestSetOption { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.key.is_empty() { os.write_string(1, &self.key)?; } @@ -1736,7 +1736,7 @@ impl ::protobuf::Clear for RequestSetOption { } impl ::std::fmt::Debug for RequestSetOption { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -1935,7 +1935,7 @@ impl ::protobuf::Message for RequestInitChain { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -1989,7 +1989,7 @@ impl ::protobuf::Message for RequestInitChain { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.time.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2110,7 +2110,7 @@ impl ::protobuf::Clear for RequestInitChain { } impl ::std::fmt::Debug for RequestInitChain { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -2232,7 +2232,7 @@ impl ::protobuf::Message for RequestQuery { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -2285,7 +2285,7 @@ impl ::protobuf::Message for RequestQuery { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.data.is_empty() { os.write_bytes(1, &self.data)?; } @@ -2391,7 +2391,7 @@ impl ::protobuf::Clear for RequestQuery { } impl ::std::fmt::Debug for RequestQuery { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -2563,7 +2563,7 @@ impl ::protobuf::Message for RequestBeginBlock { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -2611,7 +2611,7 @@ impl ::protobuf::Message for RequestBeginBlock { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.hash.is_empty() { os.write_bytes(1, &self.hash)?; } @@ -2723,7 +2723,7 @@ impl ::protobuf::Clear for RequestBeginBlock { } impl ::std::fmt::Debug for RequestBeginBlock { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -2786,7 +2786,7 @@ impl ::protobuf::Message for RequestCheckTx { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -2813,7 +2813,7 @@ impl ::protobuf::Message for RequestCheckTx { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.tx.is_empty() { os.write_bytes(1, &self.tx)?; } @@ -2892,7 +2892,7 @@ impl ::protobuf::Clear for RequestCheckTx { } impl ::std::fmt::Debug for RequestCheckTx { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -2955,7 +2955,7 @@ impl ::protobuf::Message for RequestDeliverTx { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -2982,7 +2982,7 @@ impl ::protobuf::Message for RequestDeliverTx { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.tx.is_empty() { os.write_bytes(1, &self.tx)?; } @@ -3061,7 +3061,7 @@ impl ::protobuf::Clear for RequestDeliverTx { } impl ::std::fmt::Debug for RequestDeliverTx { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -3113,7 +3113,7 @@ impl ::protobuf::Message for RequestEndBlock { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -3144,7 +3144,7 @@ impl ::protobuf::Message for RequestEndBlock { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.height != 0 { os.write_int64(1, self.height)?; } @@ -3223,7 +3223,7 @@ impl ::protobuf::Clear for RequestEndBlock { } impl ::std::fmt::Debug for RequestEndBlock { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -3258,7 +3258,7 @@ impl ::protobuf::Message for RequestCommit { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -3279,7 +3279,7 @@ impl ::protobuf::Message for RequestCommit { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3349,7 +3349,7 @@ impl ::protobuf::Clear for RequestCommit { } impl ::std::fmt::Debug for RequestCommit { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -4050,7 +4050,7 @@ impl ::protobuf::Message for Response { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -4195,7 +4195,7 @@ impl ::protobuf::Message for Response { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let ::std::option::Option::Some(ref v) = self.value { match v { &Response_oneof_value::exception(ref v) => { @@ -4401,7 +4401,7 @@ impl ::protobuf::Clear for Response { } impl ::std::fmt::Debug for Response { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -4464,7 +4464,7 @@ impl ::protobuf::Message for ResponseException { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -4491,7 +4491,7 @@ impl ::protobuf::Message for ResponseException { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.error.is_empty() { os.write_string(1, &self.error)?; } @@ -4570,7 +4570,7 @@ impl ::protobuf::Clear for ResponseException { } impl ::std::fmt::Debug for ResponseException { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -4633,7 +4633,7 @@ impl ::protobuf::Message for ResponseEcho { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -4660,7 +4660,7 @@ impl ::protobuf::Message for ResponseEcho { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.message.is_empty() { os.write_string(1, &self.message)?; } @@ -4739,7 +4739,7 @@ impl ::protobuf::Clear for ResponseEcho { } impl ::std::fmt::Debug for ResponseEcho { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -4774,7 +4774,7 @@ impl ::protobuf::Message for ResponseFlush { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -4795,7 +4795,7 @@ impl ::protobuf::Message for ResponseFlush { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4865,7 +4865,7 @@ impl ::protobuf::Clear for ResponseFlush { } impl ::std::fmt::Debug for ResponseFlush { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -5014,7 +5014,7 @@ impl ::protobuf::Message for ResponseInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -5073,7 +5073,7 @@ impl ::protobuf::Message for ResponseInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.data.is_empty() { os.write_string(1, &self.data)?; } @@ -5188,7 +5188,7 @@ impl ::protobuf::Clear for ResponseInfo { } impl ::std::fmt::Debug for ResponseInfo { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -5294,7 +5294,7 @@ impl ::protobuf::Message for ResponseSetOption { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -5337,7 +5337,7 @@ impl ::protobuf::Message for ResponseSetOption { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.code != 0 { os.write_uint32(1, self.code)?; } @@ -5434,7 +5434,7 @@ impl ::protobuf::Clear for ResponseSetOption { } impl ::std::fmt::Debug for ResponseSetOption { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -5540,7 +5540,7 @@ impl ::protobuf::Message for ResponseInitChain { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -5575,7 +5575,7 @@ impl ::protobuf::Message for ResponseInitChain { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.consensus_params.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5667,7 +5667,7 @@ impl ::protobuf::Clear for ResponseInitChain { } impl ::std::fmt::Debug for ResponseInitChain { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -5925,7 +5925,7 @@ impl ::protobuf::Message for ResponseQuery { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -6013,7 +6013,7 @@ impl ::protobuf::Message for ResponseQuery { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.code != 0 { os.write_uint32(1, self.code)?; } @@ -6166,7 +6166,7 @@ impl ::protobuf::Clear for ResponseQuery { } impl ::std::fmt::Debug for ResponseQuery { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -6233,7 +6233,7 @@ impl ::protobuf::Message for ResponseBeginBlock { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -6261,7 +6261,7 @@ impl ::protobuf::Message for ResponseBeginBlock { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { for v in &self.events { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -6342,7 +6342,7 @@ impl ::protobuf::Clear for ResponseBeginBlock { } impl ::std::fmt::Debug for ResponseBeginBlock { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -6565,7 +6565,7 @@ impl ::protobuf::Message for ResponseCheckTx { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -6647,7 +6647,7 @@ impl ::protobuf::Message for ResponseCheckTx { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.code != 0 { os.write_uint32(1, self.code)?; } @@ -6791,7 +6791,7 @@ impl ::protobuf::Clear for ResponseCheckTx { } impl ::std::fmt::Debug for ResponseCheckTx { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -7014,7 +7014,7 @@ impl ::protobuf::Message for ResponseDeliverTx { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -7096,7 +7096,7 @@ impl ::protobuf::Message for ResponseDeliverTx { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.code != 0 { os.write_uint32(1, self.code)?; } @@ -7240,7 +7240,7 @@ impl ::protobuf::Clear for ResponseDeliverTx { } impl ::std::fmt::Debug for ResponseDeliverTx { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -7377,7 +7377,7 @@ impl ::protobuf::Message for ResponseEndBlock { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -7419,7 +7419,7 @@ impl ::protobuf::Message for ResponseEndBlock { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { for v in &self.validator_updates { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -7522,7 +7522,7 @@ impl ::protobuf::Clear for ResponseEndBlock { } impl ::std::fmt::Debug for ResponseEndBlock { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -7585,7 +7585,7 @@ impl ::protobuf::Message for ResponseCommit { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -7612,7 +7612,7 @@ impl ::protobuf::Message for ResponseCommit { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.data.is_empty() { os.write_bytes(2, &self.data)?; } @@ -7691,7 +7691,7 @@ impl ::protobuf::Clear for ResponseCommit { } impl ::std::fmt::Debug for ResponseCommit { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -7844,7 +7844,7 @@ impl ::protobuf::Message for ConsensusParams { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -7886,7 +7886,7 @@ impl ::protobuf::Message for ConsensusParams { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.block.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -7989,7 +7989,7 @@ impl ::protobuf::Clear for ConsensusParams { } impl ::std::fmt::Debug for ConsensusParams { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -8057,7 +8057,7 @@ impl ::protobuf::Message for BlockParams { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -8098,7 +8098,7 @@ impl ::protobuf::Message for BlockParams { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.max_bytes != 0 { os.write_int64(1, self.max_bytes)?; } @@ -8186,7 +8186,7 @@ impl ::protobuf::Clear for BlockParams { } impl ::std::fmt::Debug for BlockParams { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -8238,7 +8238,7 @@ impl ::protobuf::Message for EvidenceParams { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -8269,7 +8269,7 @@ impl ::protobuf::Message for EvidenceParams { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.max_age != 0 { os.write_int64(1, self.max_age)?; } @@ -8348,7 +8348,7 @@ impl ::protobuf::Clear for EvidenceParams { } impl ::std::fmt::Debug for EvidenceParams { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -8410,7 +8410,7 @@ impl ::protobuf::Message for ValidatorParams { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -8437,7 +8437,7 @@ impl ::protobuf::Message for ValidatorParams { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { for v in &self.pub_key_types { os.write_string(1, &v)?; }; @@ -8516,7 +8516,7 @@ impl ::protobuf::Clear for ValidatorParams { } impl ::std::fmt::Debug for ValidatorParams { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -8599,7 +8599,7 @@ impl ::protobuf::Message for LastCommitInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -8637,7 +8637,7 @@ impl ::protobuf::Message for LastCommitInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.round != 0 { os.write_int32(1, self.round)?; } @@ -8727,7 +8727,7 @@ impl ::protobuf::Clear for LastCommitInfo { } impl ::std::fmt::Debug for LastCommitInfo { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -8821,7 +8821,7 @@ impl ::protobuf::Message for Event { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -8855,7 +8855,7 @@ impl ::protobuf::Message for Event { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.field_type.is_empty() { os.write_string(1, &self.field_type)?; } @@ -8945,7 +8945,7 @@ impl ::protobuf::Clear for Event { } impl ::std::fmt::Debug for Event { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -9416,7 +9416,7 @@ impl ::protobuf::Message for Header { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -9548,7 +9548,7 @@ impl ::protobuf::Message for Header { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.version.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -9768,7 +9768,7 @@ impl ::protobuf::Clear for Header { } impl ::std::fmt::Debug for Header { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -9836,7 +9836,7 @@ impl ::protobuf::Message for Version { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -9877,7 +9877,7 @@ impl ::protobuf::Message for Version { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.Block != 0 { os.write_uint64(1, self.Block)?; } @@ -9965,7 +9965,7 @@ impl ::protobuf::Clear for Version { } impl ::std::fmt::Debug for Version { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -10067,7 +10067,7 @@ impl ::protobuf::Message for BlockID { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -10101,7 +10101,7 @@ impl ::protobuf::Message for BlockID { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.hash.is_empty() { os.write_bytes(1, &self.hash)?; } @@ -10191,7 +10191,7 @@ impl ::protobuf::Clear for BlockID { } impl ::std::fmt::Debug for BlockID { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -10270,7 +10270,7 @@ impl ::protobuf::Message for PartSetHeader { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -10307,7 +10307,7 @@ impl ::protobuf::Message for PartSetHeader { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if self.total != 0 { os.write_int32(1, self.total)?; } @@ -10395,7 +10395,7 @@ impl ::protobuf::Clear for PartSetHeader { } impl ::std::fmt::Debug for PartSetHeader { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -10474,7 +10474,7 @@ impl ::protobuf::Message for Validator { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -10511,7 +10511,7 @@ impl ::protobuf::Message for Validator { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.address.is_empty() { os.write_bytes(1, &self.address)?; } @@ -10599,7 +10599,7 @@ impl ::protobuf::Clear for Validator { } impl ::std::fmt::Debug for Validator { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -10690,7 +10690,7 @@ impl ::protobuf::Message for ValidatorUpdate { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -10728,7 +10728,7 @@ impl ::protobuf::Message for ValidatorUpdate { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.pub_key.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -10818,7 +10818,7 @@ impl ::protobuf::Clear for ValidatorUpdate { } impl ::std::fmt::Debug for ValidatorUpdate { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -10909,7 +10909,7 @@ impl ::protobuf::Message for VoteInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -10947,7 +10947,7 @@ impl ::protobuf::Message for VoteInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.validator.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -11037,7 +11037,7 @@ impl ::protobuf::Clear for VoteInfo { } impl ::std::fmt::Debug for VoteInfo { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -11127,7 +11127,7 @@ impl ::protobuf::Message for PubKey { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -11160,7 +11160,7 @@ impl ::protobuf::Message for PubKey { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.field_type.is_empty() { os.write_string(1, &self.field_type)?; } @@ -11248,7 +11248,7 @@ impl ::protobuf::Clear for PubKey { } impl ::std::fmt::Debug for PubKey { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -11421,7 +11421,7 @@ impl ::protobuf::Message for Evidence { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -11482,7 +11482,7 @@ impl ::protobuf::Message for Evidence { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.field_type.is_empty() { os.write_string(1, &self.field_type)?; } @@ -11601,7 +11601,7 @@ impl ::protobuf::Clear for Evidence { } impl ::std::fmt::Debug for Evidence { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -11631,7 +11631,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x03\x20\x01(\x04B\0:\0\"4\n\x10RequestSetOption\x12\r\n\x03key\x18\ \x01\x20\x01(\tB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\tB\0:\0\"\xdb\x01\ \n\x10RequestInitChain\x122\n\x04time\x18\x01\x20\x01(\x0b2\x1a.google.p\ - rotobuf.TimestampB\x08\x90\xdf\x1f\x01\xc8\xde\x1f\0\x12\x12\n\x08chain_\ + rotobuf.TimestampB\x08\xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x12\n\x08chain_\ id\x18\x02\x20\x01(\tB\0\x121\n\x10consensus_params\x18\x03\x20\x01(\x0b\ 2\x15.abci.ConsensusParamsB\0\x12/\n\nvalidators\x18\x04\x20\x03(\x0b2\ \x15.abci.ValidatorUpdateB\x04\xc8\xde\x1f\0\x12\x19\n\x0fapp_state_byte\ @@ -11693,7 +11693,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ dator_updates\x18\x01\x20\x03(\x0b2\x15.abci.ValidatorUpdateB\x04\xc8\ \xde\x1f\0\x128\n\x17consensus_param_updates\x18\x02\x20\x01(\x0b2\x15.a\ bci.ConsensusParamsB\0\x125\n\x06events\x18\x03\x20\x03(\x0b2\x0b.abci.E\ - ventB\x18\xea\xde\x1f\x10events,omitempty\xc8\xde\x1f\0:\0\"\"\n\x0eResp\ + ventB\x18\xc8\xde\x1f\0\xea\xde\x1f\x10events,omitempty:\0\"\"\n\x0eResp\ onseCommit\x12\x0e\n\x04data\x18\x02\x20\x01(\x0cB\0:\0\"\x8d\x01\n\x0fC\ onsensusParams\x12\"\n\x05block\x18\x01\x20\x01(\x0b2\x11.abci.BlockPara\ msB\0\x12(\n\x08evidence\x18\x02\x20\x01(\x0b2\x14.abci.EvidenceParamsB\ @@ -11736,8 +11736,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ValidatorB\x04\xc8\xde\x1f\0\x12\x10\n\x06height\x18\x03\x20\x01(\x03B\0\ \x122\n\x04time\x18\x04\x20\x01(\x0b2\x1a.google.protobuf.TimestampB\x08\ \xc8\xde\x1f\0\x90\xdf\x1f\x01\x12\x1c\n\x12total_voting_power\x18\x05\ - \x20\x01(\x03B\0:\0B\x1c\xe0\xe2\x1e\x01\xa8\xe2\x1e\x01\xd0\xe2\x1e\x01\ - \xc8\xe2\x1e\x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01\xb8\xe2\x1e\x01b\x06pro\ + \x20\x01(\x03B\0:\0B\x1c\xb8\xe2\x1e\x01\xc0\xe3\x1e\x01\xc8\xe2\x1e\x01\ + \xa8\xe2\x1e\x01\xe0\xe2\x1e\x01\xd0\xe2\x1e\x01\xf8\xe1\x1e\x01b\x06pro\ to3\ "; diff --git a/src/messages/merkle.rs b/src/messages/merkle.rs index 5c47b31..b04be2f 100644 --- a/src/messages/merkle.rs +++ b/src/messages/merkle.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.8.0. Do not edit +// This file is generated by rust-protobuf 2.8.1. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; #[derive(PartialEq,Clone,Default)] pub struct ProofOp { @@ -132,7 +132,7 @@ impl ::protobuf::Message for ProofOp { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -171,7 +171,7 @@ impl ::protobuf::Message for ProofOp { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.field_type.is_empty() { os.write_string(1, &self.field_type)?; } @@ -268,7 +268,7 @@ impl ::protobuf::Clear for ProofOp { } impl ::std::fmt::Debug for ProofOp { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -335,7 +335,7 @@ impl ::protobuf::Message for Proof { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -363,7 +363,7 @@ impl ::protobuf::Message for Proof { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { for v in &self.ops { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -444,7 +444,7 @@ impl ::protobuf::Clear for Proof { } impl ::std::fmt::Debug for Proof { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -460,8 +460,8 @@ static file_descriptor_proto_data: &'static [u8] = b"\ rkle\":\n\x07ProofOp\x12\x0e\n\x04type\x18\x01\x20\x01(\tB\0\x12\r\n\x03\ key\x18\x02\x20\x01(\x0cB\0\x12\x0e\n\x04data\x18\x03\x20\x01(\x0cB\0:\0\ \"-\n\x05Proof\x12\"\n\x03ops\x18\x01\x20\x03(\x0b2\x0f.merkle.ProofOpB\ - \x04\xc8\xde\x1f\0:\0B\x14\xd0\xe2\x1e\x01\xc8\xe2\x1e\x01\xa8\xe2\x1e\ - \x01\xf8\xe1\x1e\x01\xe0\xe2\x1e\x01b\x06proto3\ + \x04\xc8\xde\x1f\0:\0B\x14\xc8\xe2\x1e\x01\xe0\xe2\x1e\x01\xa8\xe2\x1e\ + \x01\xd0\xe2\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { diff --git a/src/messages/types.rs b/src/messages/types.rs index f54849f..d7160bb 100644 --- a/src/messages/types.rs +++ b/src/messages/types.rs @@ -1,4 +1,4 @@ -// This file is generated by rust-protobuf 2.8.0. Do not edit +// This file is generated by rust-protobuf 2.8.1. Do not edit // @generated // https://github.com/Manishearth/rust-clippy/issues/702 @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_0; +const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; #[derive(PartialEq,Clone,Default)] pub struct KVPair { @@ -105,7 +105,7 @@ impl ::protobuf::Message for KVPair { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -138,7 +138,7 @@ impl ::protobuf::Message for KVPair { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.key.is_empty() { os.write_bytes(1, &self.key)?; } @@ -226,7 +226,7 @@ impl ::protobuf::Clear for KVPair { } impl ::std::fmt::Debug for KVPair { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -305,7 +305,7 @@ impl ::protobuf::Message for KI64Pair { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> { + fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { @@ -342,7 +342,7 @@ impl ::protobuf::Message for KI64Pair { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { if !self.key.is_empty() { os.write_bytes(1, &self.key)?; } @@ -430,7 +430,7 @@ impl ::protobuf::Clear for KI64Pair { } impl ::std::fmt::Debug for KI64Pair { - fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { ::protobuf::text_format::fmt(self, f) } } @@ -445,9 +445,9 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \n8github.com/tendermint/tendermint/libs/common/types.proto\x12\x06commo\ n\"*\n\x06KVPair\x12\r\n\x03key\x18\x01\x20\x01(\x0cB\0\x12\x0f\n\x05val\ ue\x18\x02\x20\x01(\x0cB\0:\0\",\n\x08KI64Pair\x12\r\n\x03key\x18\x01\ - \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xb8\ - \xe2\x1e\x01\xe0\xe2\x1e\x01\xa8\xe2\x1e\x01\xc8\xe2\x1e\x01\xd0\xe2\x1e\ - \x01\xc0\xe3\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ + \x20\x01(\x0cB\0\x12\x0f\n\x05value\x18\x02\x20\x01(\x03B\0:\0B\x1c\xd0\ + \xe2\x1e\x01\xb8\xe2\x1e\x01\xa8\xe2\x1e\x01\xe0\xe2\x1e\x01\xc0\xe3\x1e\ + \x01\xc8\xe2\x1e\x01\xf8\xe1\x1e\x01b\x06proto3\ "; static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {