diff --git a/tendermint/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs index 9c9438637..690a02eb9 100644 --- a/tendermint/src/abci/transaction.rs +++ b/tendermint/src/abci/transaction.rs @@ -25,7 +25,7 @@ impl Transaction { /// Convert this transaction into a byte vector pub fn into_vec(self) -> Vec { - self.0.clone() + self.0 } /// Borrow the contents of this transaction as a byte slice @@ -79,7 +79,7 @@ impl Data { /// Convert this collection into a vector pub fn into_vec(self) -> Vec { - self.iter().cloned().collect() + self.txs.unwrap_or_default() } /// Iterate over the transactions in the collection diff --git a/tendermint/src/block/size.rs b/tendermint/src/block/size.rs index 7a663672a..5e7192588 100644 --- a/tendermint/src/block/size.rs +++ b/tendermint/src/block/size.rs @@ -17,10 +17,10 @@ pub struct Size { /// Maximum amount of gas which can be spent on a block #[serde( - serialize_with = "serializers::serialize_u64", - deserialize_with = "serializers::parse_u64" + serialize_with = "serializers::serialize_i64", + deserialize_with = "serializers::parse_i64" )] - pub max_gas: u64, + pub max_gas: i64, /// Time iota in ms #[serde(