Merge branch 'master' into develop

tendermint · Nov 11, 2019 · b4a39b5 · b4a39b5
2 parents 9d2b9d4 + 5a1f912
commit b4a39b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,4 +22,4 @@ tokio = { version = "0.1", default-features = false, features = ["codec", "io",
 futures = "0.3"
 
 [build-dependencies]
-protobuf-codegen-pure = "2.8.1"
+protobuf-codegen-pure = "2.8.1"
diff --git a/src/messages/abci.rs b/src/messages/abci.rs
@@ -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\