Merge rust-bitcoin/rust-bitcoin#1035: Take Writer/Reader by `&mut` in consensus en/decoding
1fea098dfbSupport unsized `R` and `W` in consensus encode/decode (Dawid Ciężarkiewicz)a24a3b0194Forward `consensus_decode` to `consensus_decode_from_finite_reader` (Dawid Ciężarkiewicz)9c754ca4deTake Writer/Reader by `&mut` in consensus en/decoding (Dawid Ciężarkiewicz) Pull request description: Fix #1020 (see more relevant discussion there) This definitely makes the amount of generics compiler has to generate by avoding generating the same functions for `R`, `&mut R`, `&mut &mut R` and so on. old: ``` > ls -al target/release/deps/bitcoin-07a9dabf1f3e0266 -rwxrwxr-x 1 dpc dpc 9947832 Jun 2 22:42 target/release/deps/bitcoin-07a9dabf1f3e0266 > strip target/release/deps/bitcoin-07a9dabf1f3e0266 > ls -al target/release/deps/bitcoin-07a9dabf1f3e0266 -rwxrwxr-x 1 dpc dpc 4463024 Jun 2 22:46 target/release/deps/bitcoin-07a9dabf1f3e0266 ``` new: ``` > ls -al target/release/deps/bitcoin-07a9dabf1f3e0266 -rwxrwxr-x 1 dpc dpc 9866800 Jun 2 22:44 target/release/deps/bitcoin-07a9dabf1f3e0266 > strip target/release/deps/bitcoin-07a9dabf1f3e0266 > ls -al target/release/deps/bitcoin-07a9dabf1f3e0266 -rwxrwxr-x 1 dpc dpc 4393392 Jun 2 22:45 target/release/deps/bitcoin-07a9dabf1f3e0266 ``` In the unit-test binary itself, it saves ~100KB of data. I did not expect much performance gains, but turn out I was wrong(*): old: ``` test blockdata::block::benches::bench_block_deserialize ... bench: 1,072,710 ns/iter (+/- 21,871) test blockdata::block::benches::bench_block_serialize ... bench: 191,223 ns/iter (+/- 5,833) test blockdata::block::benches::bench_block_serialize_logic ... bench: 37,543 ns/iter (+/- 732) test blockdata::block::benches::bench_stream_reader ... bench: 1,872,455 ns/iter (+/- 149,519) test blockdata::transaction::benches::bench_transaction_deserialize ... bench: 136 ns/iter (+/- 3) test blockdata::transaction::benches::bench_transaction_serialize ... bench: 51 ns/iter (+/- 8) test blockdata::transaction::benches::bench_transaction_serialize_logic ... bench: 5 ns/iter (+/- 0) test blockdata::transaction::benches::bench_transaction_size ... bench: 3 ns/iter (+/- 0) ``` new: ``` test blockdata::block::benches::bench_block_deserialize ... bench: 1,028,574 ns/iter (+/- 10,910) test blockdata::block::benches::bench_block_serialize ... bench: 162,143 ns/iter (+/- 3,363) test blockdata::block::benches::bench_block_serialize_logic ... bench: 30,725 ns/iter (+/- 695) test blockdata::block::benches::bench_stream_reader ... bench: 1,437,071 ns/iter (+/- 53,694) test blockdata::transaction::benches::bench_transaction_deserialize ... bench: 92 ns/iter (+/- 2) test blockdata::transaction::benches::bench_transaction_serialize ... bench: 17 ns/iter (+/- 0) test blockdata::transaction::benches::bench_transaction_serialize_logic ... bench: 5 ns/iter (+/- 0) test blockdata::transaction::benches::bench_transaction_size ... bench: 4 ns/iter (+/- 0) ``` (*) - I'm benchmarking on a noisy laptop. Take this with a grain of salt. But I think at least it doesn't make anything slower. While doing all this manual labor that will probably generate conflicts, I took a liberty of changing generic type names and variable names to `r` and `R` (reader) and `w` and `W` for writer. ACKs for top commit: RCasatta: ACK1fea098dfbtested in downstream lib, space saving in compiled code confirmed apoelstra: ACK1fea098dfbTree-SHA512: bc11994791dc97cc468dc9d411b9abf52ad475f23adf5c43d563f323bae0da180c8f57f2f17c1bb7b9bdcf523584b0943763742b81362880206779872ad7489f
This commit is contained in:
Andrew Poelstra
commit
f401cdc99e
|
|
@ -23,7 +23,6 @@
|
|||
//! This module provides the structures and functions needed to support scripts.
|
||||
//!
|
||||
|
||||
use crate::consensus::encode::MAX_VEC_SIZE;
|
||||
use crate::prelude::*;
|
||||
|
||||
use crate::io;
|
||||
|
|
@ -1093,20 +1092,15 @@ impl serde::Serialize for Script {
|
|||
|
||||
impl Encodable for Script {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
self.0.consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
self.0.consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Script {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Ok(Script(Decodable::consensus_decode_from_finite_reader(d)?))
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(Script(Decodable::consensus_decode_from_finite_reader(r)?))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ use crate::blockdata::constants::WITNESS_SCALE_FACTOR;
|
|||
use crate::blockdata::script::Script;
|
||||
use crate::blockdata::witness::Witness;
|
||||
use crate::consensus::{encode, Decodable, Encodable};
|
||||
use crate::consensus::encode::MAX_VEC_SIZE;
|
||||
use crate::hash_types::{Sighash, Txid, Wtxid};
|
||||
use crate::VarInt;
|
||||
use crate::util::sighash::UINT256_ONE;
|
||||
|
|
@ -731,50 +730,45 @@ impl Transaction {
|
|||
impl_consensus_encoding!(TxOut, value, script_pubkey);
|
||||
|
||||
impl Encodable for OutPoint {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
let len = self.txid.consensus_encode(&mut s)?;
|
||||
Ok(len + self.vout.consensus_encode(s)?)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let len = self.txid.consensus_encode(w)?;
|
||||
Ok(len + self.vout.consensus_encode(w)?)
|
||||
}
|
||||
}
|
||||
impl Decodable for OutPoint {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(OutPoint {
|
||||
txid: Decodable::consensus_decode(&mut d)?,
|
||||
vout: Decodable::consensus_decode(d)?,
|
||||
txid: Decodable::consensus_decode(r)?,
|
||||
vout: Decodable::consensus_decode(r)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for TxIn {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += self.previous_output.consensus_encode(&mut s)?;
|
||||
len += self.script_sig.consensus_encode(&mut s)?;
|
||||
len += self.sequence.consensus_encode(s)?;
|
||||
len += self.previous_output.consensus_encode(w)?;
|
||||
len += self.script_sig.consensus_encode(w)?;
|
||||
len += self.sequence.consensus_encode(w)?;
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
impl Decodable for TxIn {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(TxIn {
|
||||
previous_output: Decodable::consensus_decode_from_finite_reader(&mut d)?,
|
||||
script_sig: Decodable::consensus_decode_from_finite_reader(&mut d)?,
|
||||
sequence: Decodable::consensus_decode_from_finite_reader(d)?,
|
||||
previous_output: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
script_sig: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
sequence: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
witness: Witness::default(),
|
||||
})
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for Transaction {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += self.version.consensus_encode(&mut s)?;
|
||||
len += self.version.consensus_encode(w)?;
|
||||
// To avoid serialization ambiguity, no inputs means we use BIP141 serialization (see
|
||||
// `Transaction` docs for full explanation).
|
||||
let mut have_witness = self.input.is_empty();
|
||||
|
|
@ -785,36 +779,36 @@ impl Encodable for Transaction {
|
|||
}
|
||||
}
|
||||
if !have_witness {
|
||||
len += self.input.consensus_encode(&mut s)?;
|
||||
len += self.output.consensus_encode(&mut s)?;
|
||||
len += self.input.consensus_encode(w)?;
|
||||
len += self.output.consensus_encode(w)?;
|
||||
} else {
|
||||
len += 0u8.consensus_encode(&mut s)?;
|
||||
len += 1u8.consensus_encode(&mut s)?;
|
||||
len += self.input.consensus_encode(&mut s)?;
|
||||
len += self.output.consensus_encode(&mut s)?;
|
||||
len += 0u8.consensus_encode(w)?;
|
||||
len += 1u8.consensus_encode(w)?;
|
||||
len += self.input.consensus_encode(w)?;
|
||||
len += self.output.consensus_encode(w)?;
|
||||
for input in &self.input {
|
||||
len += input.witness.consensus_encode(&mut s)?;
|
||||
len += input.witness.consensus_encode(w)?;
|
||||
}
|
||||
}
|
||||
len += self.lock_time.consensus_encode(s)?;
|
||||
len += self.lock_time.consensus_encode(w)?;
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Transaction {
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let version = i32::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let input = Vec::<TxIn>::consensus_decode_from_finite_reader(&mut d)?;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let version = i32::consensus_decode_from_finite_reader(r)?;
|
||||
let input = Vec::<TxIn>::consensus_decode_from_finite_reader(r)?;
|
||||
// segwit
|
||||
if input.is_empty() {
|
||||
let segwit_flag = u8::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let segwit_flag = u8::consensus_decode_from_finite_reader(r)?;
|
||||
match segwit_flag {
|
||||
// BIP144 input witnesses
|
||||
1 => {
|
||||
let mut input = Vec::<TxIn>::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let output = Vec::<TxOut>::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let mut input = Vec::<TxIn>::consensus_decode_from_finite_reader(r)?;
|
||||
let output = Vec::<TxOut>::consensus_decode_from_finite_reader(r)?;
|
||||
for txin in input.iter_mut() {
|
||||
txin.witness = Decodable::consensus_decode_from_finite_reader(&mut d)?;
|
||||
txin.witness = Decodable::consensus_decode_from_finite_reader(r)?;
|
||||
}
|
||||
if !input.is_empty() && input.iter().all(|input| input.witness.is_empty()) {
|
||||
Err(encode::Error::ParseFailed("witness flag set but no witnesses present"))
|
||||
|
|
@ -823,7 +817,7 @@ impl Decodable for Transaction {
|
|||
version,
|
||||
input,
|
||||
output,
|
||||
lock_time: Decodable::consensus_decode_from_finite_reader(d)?,
|
||||
lock_time: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -835,15 +829,11 @@ impl Decodable for Transaction {
|
|||
Ok(Transaction {
|
||||
version,
|
||||
input,
|
||||
output: Decodable::consensus_decode_from_finite_reader(&mut d)?,
|
||||
lock_time: Decodable::consensus_decode_from_finite_reader(d)?,
|
||||
output: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
lock_time: Decodable::consensus_decode_from_finite_reader(r)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
}
|
||||
}
|
||||
|
||||
/// This type is consensus valid but an input including it would prevent the transaction from
|
||||
|
|
@ -1041,6 +1031,19 @@ mod tests {
|
|||
use super::EcdsaSighashType;
|
||||
use crate::util::sighash::SighashCache;
|
||||
|
||||
const SOME_TX: &str = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";
|
||||
|
||||
#[test]
|
||||
fn encode_to_unsized_writer() {
|
||||
let mut buf = [0u8; 1024];
|
||||
let raw_tx = Vec::from_hex(SOME_TX).unwrap();
|
||||
let tx: Transaction = Decodable::consensus_decode(&mut raw_tx.as_slice()).unwrap();
|
||||
|
||||
let size = tx.consensus_encode(&mut &mut buf[..]).unwrap();
|
||||
assert_eq!(size, SOME_TX.len() / 2);
|
||||
assert_eq!(raw_tx, &buf[..size]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_outpoint() {
|
||||
assert_eq!(OutPoint::from_str("i don't care"),
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ pub struct Iter<'a> {
|
|||
}
|
||||
|
||||
impl Decodable for Witness {
|
||||
fn consensus_decode<D: Read>(mut d: D) -> Result<Self, Error> {
|
||||
let witness_elements = VarInt::consensus_decode(&mut d)?.0 as usize;
|
||||
fn consensus_decode<R: Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let witness_elements = VarInt::consensus_decode(r)?.0 as usize;
|
||||
if witness_elements == 0 {
|
||||
Ok(Witness::default())
|
||||
} else {
|
||||
|
|
@ -62,7 +62,7 @@ impl Decodable for Witness {
|
|||
for _ in 0..witness_elements {
|
||||
second_to_last = last;
|
||||
last = cursor;
|
||||
let element_size_varint = VarInt::consensus_decode(&mut d)?;
|
||||
let element_size_varint = VarInt::consensus_decode(r)?;
|
||||
let element_size_varint_len = element_size_varint.len();
|
||||
let element_size = element_size_varint.0 as usize;
|
||||
let required_len = cursor
|
||||
|
|
@ -86,9 +86,9 @@ impl Decodable for Witness {
|
|||
|
||||
resize_if_needed(&mut content, required_len);
|
||||
element_size_varint
|
||||
.consensus_encode(&mut content[cursor..cursor + element_size_varint_len])?;
|
||||
.consensus_encode(&mut &mut content[cursor..cursor + element_size_varint_len])?;
|
||||
cursor += element_size_varint_len;
|
||||
d.read_exact(&mut content[cursor..cursor + element_size])?;
|
||||
r.read_exact(&mut content[cursor..cursor + element_size])?;
|
||||
cursor += element_size;
|
||||
}
|
||||
content.truncate(cursor);
|
||||
|
|
@ -113,10 +113,10 @@ fn resize_if_needed(vec: &mut Vec<u8>, required_len: usize) {
|
|||
}
|
||||
|
||||
impl Encodable for Witness {
|
||||
fn consensus_encode<W: Write>(&self, mut writer: W) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let len = VarInt(self.witness_elements as u64);
|
||||
len.consensus_encode(&mut writer)?;
|
||||
writer.emit_slice(&self.content[..])?;
|
||||
len.consensus_encode(w)?;
|
||||
w.emit_slice(&self.content[..])?;
|
||||
Ok(self.content.len() + len.len())
|
||||
}
|
||||
}
|
||||
|
|
@ -145,7 +145,7 @@ impl Witness {
|
|||
last = cursor;
|
||||
let el_len_varint = VarInt(el.len() as u64);
|
||||
el_len_varint
|
||||
.consensus_encode(&mut content[cursor..cursor + el_len_varint.len()])
|
||||
.consensus_encode(&mut &mut content[cursor..cursor + el_len_varint.len()])
|
||||
.expect("writers on vec don't errors, space granted by content_size");
|
||||
cursor += el_len_varint.len();
|
||||
content[cursor..cursor + el.len()].copy_from_slice(&el);
|
||||
|
|
@ -208,7 +208,7 @@ impl Witness {
|
|||
.resize(current_content_len + element_len_varint.len() + new_element.len(), 0);
|
||||
let end_varint = current_content_len + element_len_varint.len();
|
||||
element_len_varint
|
||||
.consensus_encode(&mut self.content[current_content_len..end_varint])
|
||||
.consensus_encode(&mut &mut self.content[current_content_len..end_varint])
|
||||
.expect("writers on vec don't error, space granted through previous resize");
|
||||
self.content[end_varint..].copy_from_slice(new_element);
|
||||
}
|
||||
|
|
@ -225,7 +225,7 @@ impl Witness {
|
|||
|
||||
|
||||
fn element_at(&self, index: usize) -> Option<&[u8]> {
|
||||
let varint = VarInt::consensus_decode(&self.content[index..]).ok()?;
|
||||
let varint = VarInt::consensus_decode(&mut &self.content[index..]).ok()?;
|
||||
let start = index + varint.len();
|
||||
Some(&self.content[start..start + varint.0 as usize])
|
||||
}
|
||||
|
|
@ -253,7 +253,7 @@ impl<'a> Iterator for Iter<'a> {
|
|||
type Item = &'a [u8];
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
let varint = VarInt::consensus_decode(self.inner.as_slice()).ok()?;
|
||||
let varint = VarInt::consensus_decode(&mut self.inner.as_slice()).ok()?;
|
||||
self.inner.nth(varint.len() - 1)?; // VarInt::len returns at least 1
|
||||
let len = varint.0 as usize;
|
||||
let slice = &self.inner.as_slice()[..len];
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ pub fn deserialize_partial<T: Decodable>(data: &[u8]) -> Result<(T, usize), Erro
|
|||
|
||||
|
||||
/// Extensions of `Write` to encode data as per Bitcoin consensus
|
||||
pub trait WriteExt {
|
||||
pub trait WriteExt : io::Write {
|
||||
/// Output a 64-bit uint
|
||||
fn emit_u64(&mut self, v: u64) -> Result<(), io::Error>;
|
||||
/// Output a 32-bit uint
|
||||
|
|
@ -203,7 +203,7 @@ pub trait WriteExt {
|
|||
}
|
||||
|
||||
/// Extensions of `Read` to decode data as per Bitcoin consensus
|
||||
pub trait ReadExt {
|
||||
pub trait ReadExt : io::Read {
|
||||
/// Read a 64-bit uint
|
||||
fn read_u64(&mut self) -> Result<u64, Error>;
|
||||
/// Read a 32-bit uint
|
||||
|
|
@ -250,7 +250,7 @@ macro_rules! decoder_fn {
|
|||
}
|
||||
}
|
||||
|
||||
impl<W: io::Write> WriteExt for W {
|
||||
impl<W: io::Write + ?Sized> WriteExt for W {
|
||||
encoder_fn!(emit_u64, u64, u64_to_array_le);
|
||||
encoder_fn!(emit_u32, u32, u32_to_array_le);
|
||||
encoder_fn!(emit_u16, u16, u16_to_array_le);
|
||||
|
|
@ -276,7 +276,7 @@ impl<W: io::Write> WriteExt for W {
|
|||
}
|
||||
}
|
||||
|
||||
impl<R: Read> ReadExt for R {
|
||||
impl<R: Read + ?Sized> ReadExt for R {
|
||||
decoder_fn!(read_u64, u64, slice_to_u64_le, 8);
|
||||
decoder_fn!(read_u32, u32, slice_to_u32_le, 4);
|
||||
decoder_fn!(read_u16, u16, slice_to_u16_le, 2);
|
||||
|
|
@ -315,7 +315,7 @@ pub trait Encodable {
|
|||
/// Returns the number of bytes written on success.
|
||||
///
|
||||
/// The only errors returned are errors propagated from the writer.
|
||||
fn consensus_encode<W: io::Write>(&self, writer: W) -> Result<usize, io::Error>;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error>;
|
||||
}
|
||||
|
||||
/// Data which can be encoded in a consensus-consistent way
|
||||
|
|
@ -353,16 +353,27 @@ pub trait Decodable: Sized {
|
|||
/// should also implement it applying same rules, and in addition make sure to call
|
||||
/// `consensus_decode_from_finite_reader` on all members, to avoid creating redundant
|
||||
/// `Take` wrappers. Failure to do so might result only in a tiny performance hit.
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
|
||||
// This method is always strictly less general than, `consensus_decode`,
|
||||
// so it's safe and make sense to default to just calling it.
|
||||
// This way most types, that don't care about protecting against
|
||||
// resource exhaustion due to malicious input, can just ignore it.
|
||||
Self::consensus_decode(d)
|
||||
Self::consensus_decode(reader)
|
||||
}
|
||||
|
||||
/// Decode an object with a well-defined format
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error>;
|
||||
/// Decode an object with a well-defined format.
|
||||
///
|
||||
/// This is the method that should be implemented for a typical, fixed sized type
|
||||
/// implementing this trait. Default implementation is wrapping the reader
|
||||
/// in [`crate::io::Take`] to limit the input size to [`MAX_VEC_SIZE`], and forwards the call to
|
||||
/// [`Self::consensus_decode_from_finite_reader`], which is convenient
|
||||
/// for types that override [`Self::consensus_decode_from_finite_reader`]
|
||||
/// instead.
|
||||
#[inline]
|
||||
fn consensus_decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
|
||||
Self::consensus_decode_from_finite_reader(reader.take(MAX_VEC_SIZE as u64).by_ref())
|
||||
}
|
||||
}
|
||||
|
||||
/// A variable-length unsigned integer
|
||||
|
|
@ -378,14 +389,14 @@ macro_rules! impl_int_encodable {
|
|||
($ty:ident, $meth_dec:ident, $meth_enc:ident) => {
|
||||
impl Decodable for $ty {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
ReadExt::$meth_dec(&mut d)
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
ReadExt::$meth_dec(r)
|
||||
}
|
||||
}
|
||||
impl Encodable for $ty {
|
||||
#[inline]
|
||||
fn consensus_encode<S: WriteExt>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
s.$meth_enc(*self)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
w.$meth_enc(*self)?;
|
||||
Ok(mem::size_of::<$ty>())
|
||||
}
|
||||
}
|
||||
|
|
@ -419,25 +430,25 @@ impl VarInt {
|
|||
|
||||
impl Encodable for VarInt {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
match self.0 {
|
||||
0..=0xFC => {
|
||||
(self.0 as u8).consensus_encode(s)?;
|
||||
(self.0 as u8).consensus_encode(w)?;
|
||||
Ok(1)
|
||||
},
|
||||
0xFD..=0xFFFF => {
|
||||
s.emit_u8(0xFD)?;
|
||||
(self.0 as u16).consensus_encode(s)?;
|
||||
w.emit_u8(0xFD)?;
|
||||
(self.0 as u16).consensus_encode(w)?;
|
||||
Ok(3)
|
||||
},
|
||||
0x10000..=0xFFFFFFFF => {
|
||||
s.emit_u8(0xFE)?;
|
||||
(self.0 as u32).consensus_encode(s)?;
|
||||
w.emit_u8(0xFE)?;
|
||||
(self.0 as u32).consensus_encode(w)?;
|
||||
Ok(5)
|
||||
},
|
||||
_ => {
|
||||
s.emit_u8(0xFF)?;
|
||||
(self.0 as u64).consensus_encode(s)?;
|
||||
w.emit_u8(0xFF)?;
|
||||
(self.0 as u64).consensus_encode(w)?;
|
||||
Ok(9)
|
||||
},
|
||||
}
|
||||
|
|
@ -446,11 +457,11 @@ impl Encodable for VarInt {
|
|||
|
||||
impl Decodable for VarInt {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
let n = ReadExt::read_u8(&mut d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let n = ReadExt::read_u8(r)?;
|
||||
match n {
|
||||
0xFF => {
|
||||
let x = ReadExt::read_u64(&mut d)?;
|
||||
let x = ReadExt::read_u64(r)?;
|
||||
if x < 0x100000000 {
|
||||
Err(self::Error::NonMinimalVarInt)
|
||||
} else {
|
||||
|
|
@ -458,7 +469,7 @@ impl Decodable for VarInt {
|
|||
}
|
||||
}
|
||||
0xFE => {
|
||||
let x = ReadExt::read_u32(&mut d)?;
|
||||
let x = ReadExt::read_u32(r)?;
|
||||
if x < 0x10000 {
|
||||
Err(self::Error::NonMinimalVarInt)
|
||||
} else {
|
||||
|
|
@ -466,7 +477,7 @@ impl Decodable for VarInt {
|
|||
}
|
||||
}
|
||||
0xFD => {
|
||||
let x = ReadExt::read_u16(&mut d)?;
|
||||
let x = ReadExt::read_u16(r)?;
|
||||
if x < 0xFD {
|
||||
Err(self::Error::NonMinimalVarInt)
|
||||
} else {
|
||||
|
|
@ -481,34 +492,34 @@ impl Decodable for VarInt {
|
|||
// Booleans
|
||||
impl Encodable for bool {
|
||||
#[inline]
|
||||
fn consensus_encode<S: WriteExt>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
s.emit_bool(*self)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
w.emit_bool(*self)?;
|
||||
Ok(1)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for bool {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<bool, Error> {
|
||||
ReadExt::read_bool(&mut d)
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<bool, Error> {
|
||||
ReadExt::read_bool(r)
|
||||
}
|
||||
}
|
||||
|
||||
// Strings
|
||||
impl Encodable for String {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let b = self.as_bytes();
|
||||
let vi_len = VarInt(b.len() as u64).consensus_encode(&mut s)?;
|
||||
s.emit_slice(b)?;
|
||||
let vi_len = VarInt(b.len() as u64).consensus_encode(w)?;
|
||||
w.emit_slice(b)?;
|
||||
Ok(vi_len + b.len())
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for String {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<String, Error> {
|
||||
String::from_utf8(Decodable::consensus_decode(d)?)
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<String, Error> {
|
||||
String::from_utf8(Decodable::consensus_decode(r)?)
|
||||
.map_err(|_| self::Error::ParseFailed("String was not valid UTF8"))
|
||||
}
|
||||
}
|
||||
|
|
@ -516,18 +527,18 @@ impl Decodable for String {
|
|||
// Cow<'static, str>
|
||||
impl Encodable for Cow<'static, str> {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let b = self.as_bytes();
|
||||
let vi_len = VarInt(b.len() as u64).consensus_encode(&mut s)?;
|
||||
s.emit_slice(b)?;
|
||||
let vi_len = VarInt(b.len() as u64).consensus_encode(w)?;
|
||||
w.emit_slice(b)?;
|
||||
Ok(vi_len + b.len())
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Cow<'static, str> {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Cow<'static, str>, Error> {
|
||||
String::from_utf8(Decodable::consensus_decode(d)?)
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Cow<'static, str>, Error> {
|
||||
String::from_utf8(Decodable::consensus_decode(r)?)
|
||||
.map_err(|_| self::Error::ParseFailed("String was not valid UTF8"))
|
||||
.map(Cow::Owned)
|
||||
}
|
||||
|
|
@ -539,17 +550,17 @@ macro_rules! impl_array {
|
|||
( $size:expr ) => {
|
||||
impl Encodable for [u8; $size] {
|
||||
#[inline]
|
||||
fn consensus_encode<S: WriteExt>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
s.emit_slice(&self[..])?;
|
||||
fn consensus_encode<W: WriteExt + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
w.emit_slice(&self[..])?;
|
||||
Ok(self.len())
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for [u8; $size] {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let mut ret = [0; $size];
|
||||
d.read_slice(&mut ret)?;
|
||||
r.read_slice(&mut ret)?;
|
||||
Ok(ret)
|
||||
}
|
||||
}
|
||||
|
|
@ -567,10 +578,10 @@ impl_array!(33);
|
|||
|
||||
impl Decodable for [u16; 8] {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let mut res = [0; 8];
|
||||
for item in &mut res {
|
||||
*item = Decodable::consensus_decode(&mut d)?;
|
||||
*item = Decodable::consensus_decode(r)?;
|
||||
}
|
||||
Ok(res)
|
||||
}
|
||||
|
|
@ -578,8 +589,8 @@ impl Decodable for [u16; 8] {
|
|||
|
||||
impl Encodable for [u16; 8] {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
for c in self.iter() { c.consensus_encode(&mut s)?; }
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
for c in self.iter() { c.consensus_encode(w)?; }
|
||||
Ok(16)
|
||||
}
|
||||
}
|
||||
|
|
@ -589,11 +600,11 @@ macro_rules! impl_vec {
|
|||
($type: ty) => {
|
||||
impl Encodable for Vec<$type> {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += VarInt(self.len() as u64).consensus_encode(&mut s)?;
|
||||
len += VarInt(self.len() as u64).consensus_encode(w)?;
|
||||
for c in self.iter() {
|
||||
len += c.consensus_encode(&mut s)?;
|
||||
len += c.consensus_encode(w)?;
|
||||
}
|
||||
Ok(len)
|
||||
}
|
||||
|
|
@ -601,8 +612,8 @@ macro_rules! impl_vec {
|
|||
|
||||
impl Decodable for Vec<$type> {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
let len = VarInt::consensus_decode_from_finite_reader(&mut d)?.0;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let len = VarInt::consensus_decode_from_finite_reader(r)?.0;
|
||||
// Do not allocate upfront more items than if the sequnce of type
|
||||
// occupied roughly quarter a block. This should never be the case
|
||||
// for normal data, but even if that's not true - `push` will just
|
||||
|
|
@ -612,15 +623,10 @@ macro_rules! impl_vec {
|
|||
let max_capacity = MAX_VEC_SIZE / 4 / mem::size_of::<$type>();
|
||||
let mut ret = Vec::with_capacity(core::cmp::min(len as usize, max_capacity));
|
||||
for _ in 0..len {
|
||||
ret.push(Decodable::consensus_decode_from_finite_reader(&mut d)?);
|
||||
ret.push(Decodable::consensus_decode_from_finite_reader(r)?);
|
||||
}
|
||||
Ok(ret)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -675,41 +681,31 @@ fn read_bytes_from_finite_reader<D: io::Read>(mut d: D, mut opts: ReadBytesFromF
|
|||
|
||||
impl Encodable for Vec<u8> {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
consensus_encode_with_size(self, s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
consensus_encode_with_size(self, w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Vec<u8> {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
let len = VarInt::consensus_decode(&mut d)?.0 as usize;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let len = VarInt::consensus_decode(r)?.0 as usize;
|
||||
// most real-world vec of bytes data, wouldn't be larger than 128KiB
|
||||
read_bytes_from_finite_reader(d, ReadBytesFromFiniteReaderOpts { len, chunk_size: 128 * 1024 })
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
read_bytes_from_finite_reader(r, ReadBytesFromFiniteReaderOpts { len, chunk_size: 128 * 1024 })
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for Box<[u8]> {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
consensus_encode_with_size(self, s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
consensus_encode_with_size(self, w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Box<[u8]> {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
<Vec<u8>>::consensus_decode_from_finite_reader(d).map(From::from)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
<Vec<u8>>::consensus_decode_from_finite_reader(r).map(From::from)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -723,21 +719,21 @@ fn sha2_checksum(data: &[u8]) -> [u8; 4] {
|
|||
// Checked data
|
||||
impl Encodable for CheckedData {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
(self.0.len() as u32).consensus_encode(&mut s)?;
|
||||
sha2_checksum(&self.0).consensus_encode(&mut s)?;
|
||||
s.emit_slice(&self.0)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
(self.0.len() as u32).consensus_encode(w)?;
|
||||
sha2_checksum(&self.0).consensus_encode(w)?;
|
||||
w.emit_slice(&self.0)?;
|
||||
Ok(8 + self.0.len())
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for CheckedData {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
let len = u32::consensus_decode_from_finite_reader(&mut d)? as usize;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
let len = u32::consensus_decode_from_finite_reader(r)? as usize;
|
||||
|
||||
let checksum = <[u8; 4]>::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let ret = read_bytes_from_finite_reader(d, ReadBytesFromFiniteReaderOpts { len, chunk_size: MAX_VEC_SIZE })?;
|
||||
let checksum = <[u8; 4]>::consensus_decode_from_finite_reader(r)?;
|
||||
let ret = read_bytes_from_finite_reader(r, ReadBytesFromFiniteReaderOpts { len, chunk_size: MAX_VEC_SIZE })?;
|
||||
let expected_checksum = sha2_checksum(&ret);
|
||||
if expected_checksum != checksum {
|
||||
Err(self::Error::InvalidChecksum {
|
||||
|
|
@ -748,34 +744,30 @@ impl Decodable for CheckedData {
|
|||
Ok(CheckedData(ret))
|
||||
}
|
||||
}
|
||||
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_VEC_SIZE as u64))
|
||||
}
|
||||
}
|
||||
|
||||
// References
|
||||
impl<'a, T: Encodable> Encodable for &'a T {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a, T: Encodable> Encodable for &'a mut T {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Encodable> Encodable for rc::Rc<T> {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Encodable> Encodable for sync::Arc<T> {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
(&**self).consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -785,13 +777,13 @@ macro_rules! tuple_encode {
|
|||
impl <$($x: Encodable),*> Encodable for ($($x),*) {
|
||||
#[inline]
|
||||
#[allow(non_snake_case)]
|
||||
fn consensus_encode<S: io::Write>(
|
||||
fn consensus_encode<W: io::Write + ?Sized>(
|
||||
&self,
|
||||
mut s: S,
|
||||
w: &mut W,
|
||||
) -> Result<usize, io::Error> {
|
||||
let &($(ref $x),*) = self;
|
||||
let mut len = 0;
|
||||
$(len += $x.consensus_encode(&mut s)?;)*
|
||||
$(len += $x.consensus_encode(w)?;)*
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
|
@ -799,8 +791,8 @@ macro_rules! tuple_encode {
|
|||
impl<$($x: Decodable),*> Decodable for ($($x),*) {
|
||||
#[inline]
|
||||
#[allow(non_snake_case)]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, Error> {
|
||||
Ok(($({let $x = Decodable::consensus_decode(&mut d)?; $x }),*))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
Ok(($({let $x = Decodable::consensus_decode(r)?; $x }),*))
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -815,38 +807,38 @@ tuple_encode!(T0, T1, T2, T3, T4, T5, T6);
|
|||
tuple_encode!(T0, T1, T2, T3, T4, T5, T6, T7);
|
||||
|
||||
impl Encodable for sha256d::Hash {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for sha256d::Hash {
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(d)?))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(r)?))
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for sha256::Hash {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for sha256::Hash {
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(d)?))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(r)?))
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for TapLeafHash {
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
self.into_inner().consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for TapLeafHash {
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(d)?))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, Error> {
|
||||
Ok(Self::from_inner(<<Self as Hash>::Inner>::consensus_decode(r)?))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,15 +25,15 @@ use crate::hashes::{Hash, sha256, sha256d, hash160, hash_newtype};
|
|||
macro_rules! impl_hashencode {
|
||||
($hashtype:ident) => {
|
||||
impl $crate::consensus::Encodable for $hashtype {
|
||||
fn consensus_encode<S: $crate::io::Write>(&self, s: S) -> Result<usize, $crate::io::Error> {
|
||||
self.0.consensus_encode(s)
|
||||
fn consensus_encode<W: $crate::io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, $crate::io::Error> {
|
||||
self.0.consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl $crate::consensus::Decodable for $hashtype {
|
||||
fn consensus_decode<D: $crate::io::Read>(d: D) -> Result<Self, $crate::consensus::encode::Error> {
|
||||
fn consensus_decode<R: $crate::io::Read + ?Sized>(r: &mut R) -> Result<Self, $crate::consensus::encode::Error> {
|
||||
use $crate::hashes::Hash;
|
||||
Ok(Self::from_inner(<<$hashtype as $crate::hashes::Hash>::Inner>::consensus_decode(d)?))
|
||||
Ok(Self::from_inner(<<$hashtype as $crate::hashes::Hash>::Inner>::consensus_decode(r)?))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@ macro_rules! impl_consensus_encoding {
|
|||
($thing:ident, $($field:ident),+) => (
|
||||
impl $crate::consensus::Encodable for $thing {
|
||||
#[inline]
|
||||
fn consensus_encode<S: $crate::io::Write>(
|
||||
fn consensus_encode<R: $crate::io::Write + ?Sized>(
|
||||
&self,
|
||||
mut s: S,
|
||||
r: &mut R,
|
||||
) -> Result<usize, $crate::io::Error> {
|
||||
let mut len = 0;
|
||||
$(len += self.$field.consensus_encode(&mut s)?;)+
|
||||
$(len += self.$field.consensus_encode(r)?;)+
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
|
@ -34,21 +34,22 @@ macro_rules! impl_consensus_encoding {
|
|||
impl $crate::consensus::Decodable for $thing {
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: $crate::io::Read>(
|
||||
mut d: D,
|
||||
fn consensus_decode_from_finite_reader<R: $crate::io::Read + ?Sized>(
|
||||
r: &mut R,
|
||||
) -> Result<$thing, $crate::consensus::encode::Error> {
|
||||
Ok($thing {
|
||||
$($field: $crate::consensus::Decodable::consensus_decode_from_finite_reader(&mut d)?),+
|
||||
$($field: $crate::consensus::Decodable::consensus_decode_from_finite_reader(r)?),+
|
||||
})
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: $crate::io::Read>(
|
||||
d: D,
|
||||
fn consensus_decode<R: $crate::io::Read + ?Sized>(
|
||||
r: &mut R,
|
||||
) -> Result<$thing, $crate::consensus::encode::Error> {
|
||||
let mut d = d.take($crate::consensus::encode::MAX_VEC_SIZE as u64);
|
||||
use crate::io::Read as _;
|
||||
let mut r = r.take($crate::consensus::encode::MAX_VEC_SIZE as u64);
|
||||
Ok($thing {
|
||||
$($field: $crate::consensus::Decodable::consensus_decode(&mut d)?),+
|
||||
$($field: $crate::consensus::Decodable::consensus_decode(r.by_ref())?),+
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,15 +69,15 @@ impl Address {
|
|||
|
||||
impl Encodable for Address {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
let mut len = self.services.consensus_encode(&mut s)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = self.services.consensus_encode(w)?;
|
||||
|
||||
for word in &self.address {
|
||||
s.write_all(&word.to_be_bytes())?;
|
||||
w.write_all(&word.to_be_bytes())?;
|
||||
len += 2;
|
||||
}
|
||||
|
||||
s.write_all(&self.port.to_be_bytes())?;
|
||||
w.write_all(&self.port.to_be_bytes())?;
|
||||
len += 2;
|
||||
|
||||
Ok(len)
|
||||
|
|
@ -86,22 +86,22 @@ impl Encodable for Address {
|
|||
|
||||
impl Decodable for Address {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(Address {
|
||||
services: Decodable::consensus_decode(&mut d)?,
|
||||
address: read_be_address(&mut d)?,
|
||||
port: u16::swap_bytes(Decodable::consensus_decode(d)?)
|
||||
services: Decodable::consensus_decode(r)?,
|
||||
address: read_be_address(r)?,
|
||||
port: u16::swap_bytes(Decodable::consensus_decode(r)?)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Read a big-endian address from reader.
|
||||
fn read_be_address<R: io::Read>(mut r: R) -> Result<[u16; 8], encode::Error> {
|
||||
fn read_be_address<R: io::Read + ?Sized>(r: &mut R) -> Result<[u16; 8], encode::Error> {
|
||||
let mut address = [0u16; 8];
|
||||
let mut buf = [0u8; 2];
|
||||
|
||||
for word in &mut address {
|
||||
io::Read::read_exact(&mut r, &mut buf)?;
|
||||
io::Read::read_exact(r, &mut buf)?;
|
||||
*word = u16::from_be_bytes(buf)
|
||||
}
|
||||
Ok(address)
|
||||
|
|
@ -147,12 +147,12 @@ pub enum AddrV2 {
|
|||
}
|
||||
|
||||
impl Encodable for AddrV2 {
|
||||
fn consensus_encode<W: io::Write>(&self, e: W) -> Result<usize, io::Error> {
|
||||
fn encode_addr<W: io::Write>(mut e: W, network: u8, bytes: &[u8]) -> Result<usize, io::Error> {
|
||||
let len = network.consensus_encode(&mut e)?
|
||||
+ VarInt(bytes.len() as u64).consensus_encode(&mut e)?
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, e: &mut W) -> Result<usize, io::Error> {
|
||||
fn encode_addr<W: io::Write + ?Sized>(w: &mut W, network: u8, bytes: &[u8]) -> Result<usize, io::Error> {
|
||||
let len = network.consensus_encode(w)?
|
||||
+ VarInt(bytes.len() as u64).consensus_encode(w)?
|
||||
+ bytes.len();
|
||||
e.emit_slice(bytes)?;
|
||||
w.emit_slice(bytes)?;
|
||||
Ok(len)
|
||||
}
|
||||
Ok(match *self {
|
||||
|
|
@ -168,9 +168,9 @@ impl Encodable for AddrV2 {
|
|||
}
|
||||
|
||||
impl Decodable for AddrV2 {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let network_id = u8::consensus_decode(&mut d)?;
|
||||
let len = VarInt::consensus_decode(&mut d)?.0;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let network_id = u8::consensus_decode(r)?;
|
||||
let len = VarInt::consensus_decode(r)?.0;
|
||||
if len > 512 {
|
||||
return Err(encode::Error::ParseFailed("IP must be <= 512 bytes"));
|
||||
}
|
||||
|
|
@ -179,14 +179,14 @@ impl Decodable for AddrV2 {
|
|||
if len != 4 {
|
||||
return Err(encode::Error::ParseFailed("Invalid IPv4 address"));
|
||||
}
|
||||
let addr: [u8; 4] = Decodable::consensus_decode(&mut d)?;
|
||||
let addr: [u8; 4] = Decodable::consensus_decode(r)?;
|
||||
AddrV2::Ipv4(Ipv4Addr::new(addr[0], addr[1], addr[2], addr[3]))
|
||||
},
|
||||
2 => {
|
||||
if len != 16 {
|
||||
return Err(encode::Error::ParseFailed("Invalid IPv6 address"));
|
||||
}
|
||||
let addr: [u16; 8] = read_be_address(&mut d)?;
|
||||
let addr: [u16; 8] = read_be_address(r)?;
|
||||
if addr[0..3] == ONION {
|
||||
return Err(encode::Error::ParseFailed("OnionCat address sent with IPv6 network id"));
|
||||
}
|
||||
|
|
@ -199,28 +199,28 @@ impl Decodable for AddrV2 {
|
|||
if len != 10 {
|
||||
return Err(encode::Error::ParseFailed("Invalid TorV2 address"));
|
||||
}
|
||||
let id = Decodable::consensus_decode(&mut d)?;
|
||||
let id = Decodable::consensus_decode(r)?;
|
||||
AddrV2::TorV2(id)
|
||||
},
|
||||
4 => {
|
||||
if len != 32 {
|
||||
return Err(encode::Error::ParseFailed("Invalid TorV3 address"));
|
||||
}
|
||||
let pubkey = Decodable::consensus_decode(&mut d)?;
|
||||
let pubkey = Decodable::consensus_decode(r)?;
|
||||
AddrV2::TorV3(pubkey)
|
||||
},
|
||||
5 => {
|
||||
if len != 32 {
|
||||
return Err(encode::Error::ParseFailed("Invalid I2P address"));
|
||||
}
|
||||
let hash = Decodable::consensus_decode(&mut d)?;
|
||||
let hash = Decodable::consensus_decode(r)?;
|
||||
AddrV2::I2p(hash)
|
||||
},
|
||||
6 => {
|
||||
if len != 16 {
|
||||
return Err(encode::Error::ParseFailed("Invalid CJDNS address"));
|
||||
}
|
||||
let addr: [u16; 8] = read_be_address(&mut d)?;
|
||||
let addr: [u16; 8] = read_be_address(r)?;
|
||||
// check the first byte for the CJDNS marker
|
||||
if addr[0] != u16::from_be_bytes([0xFC, 0x00]) {
|
||||
return Err(encode::Error::ParseFailed("Invalid CJDNS address"));
|
||||
|
|
@ -230,7 +230,7 @@ impl Decodable for AddrV2 {
|
|||
_ => {
|
||||
// len already checked above to be <= 512
|
||||
let mut addr = vec![0u8; len as usize];
|
||||
d.read_slice(&mut addr)?;
|
||||
r.read_slice(&mut addr)?;
|
||||
AddrV2::Unknown(network_id, addr)
|
||||
}
|
||||
})
|
||||
|
|
@ -264,26 +264,26 @@ impl AddrV2Message {
|
|||
}
|
||||
|
||||
impl Encodable for AddrV2Message {
|
||||
fn consensus_encode<W: io::Write>(&self, mut e: W) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += self.time.consensus_encode(&mut e)?;
|
||||
len += VarInt(self.services.to_u64()).consensus_encode(&mut e)?;
|
||||
len += self.addr.consensus_encode(&mut e)?;
|
||||
len += self.time.consensus_encode(w)?;
|
||||
len += VarInt(self.services.to_u64()).consensus_encode(w)?;
|
||||
len += self.addr.consensus_encode(w)?;
|
||||
|
||||
// consensus_encode always encodes in LE, and we want to encode in BE.
|
||||
//TODO `len += io::Write::write(&mut e, &self.port.to_be_bytes())?;` when MSRV >= 1.32
|
||||
len += self.port.swap_bytes().consensus_encode(e)?;
|
||||
//TODO `len += io::Write::write(w, &self.port.to_be_bytes())?;` when MSRV >= 1.32
|
||||
len += self.port.swap_bytes().consensus_encode(w)?;
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for AddrV2Message {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(AddrV2Message {
|
||||
time: Decodable::consensus_decode(&mut d)?,
|
||||
services: ServiceFlags::from(VarInt::consensus_decode(&mut d)?.0),
|
||||
addr: Decodable::consensus_decode(&mut d)?,
|
||||
port: u16::swap_bytes(Decodable::consensus_decode(d)?),
|
||||
time: Decodable::consensus_decode(r)?,
|
||||
services: ServiceFlags::from(VarInt::consensus_decode(r)?.0),
|
||||
addr: Decodable::consensus_decode(r)?,
|
||||
port: u16::swap_bytes(Decodable::consensus_decode(r)?),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -280,15 +280,15 @@ impl ops::BitXorAssign for ServiceFlags {
|
|||
|
||||
impl Encodable for ServiceFlags {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
self.0.consensus_encode(&mut s)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
self.0.consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for ServiceFlags {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
Ok(ServiceFlags(Decodable::consensus_decode(&mut d)?))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(ServiceFlags(Decodable::consensus_decode(r)?))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ use crate::prelude::*;
|
|||
use core::{fmt, iter};
|
||||
|
||||
use crate::io;
|
||||
use io::Read as _;
|
||||
use crate::blockdata::block;
|
||||
use crate::blockdata::transaction;
|
||||
use crate::network::address::{Address, AddrV2Message};
|
||||
|
|
@ -79,19 +80,19 @@ impl AsRef<str> for CommandString {
|
|||
|
||||
impl Encodable for CommandString {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut rawbytes = [0u8; 12];
|
||||
let strbytes = self.0.as_bytes();
|
||||
debug_assert!(strbytes.len() <= 12);
|
||||
rawbytes[..strbytes.len()].copy_from_slice(strbytes);
|
||||
rawbytes.consensus_encode(s)
|
||||
rawbytes.consensus_encode(w)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for CommandString {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
let rawbytes: [u8; 12] = Decodable::consensus_decode(d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let rawbytes: [u8; 12] = Decodable::consensus_decode(r)?;
|
||||
let rv = iter::FromIterator::from_iter(
|
||||
rawbytes
|
||||
.iter()
|
||||
|
|
@ -286,22 +287,22 @@ struct HeaderSerializationWrapper<'a>(&'a Vec<block::BlockHeader>);
|
|||
|
||||
impl<'a> Encodable for HeaderSerializationWrapper<'a> {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += VarInt(self.0.len() as u64).consensus_encode(&mut s)?;
|
||||
len += VarInt(self.0.len() as u64).consensus_encode(w)?;
|
||||
for header in self.0.iter() {
|
||||
len += header.consensus_encode(&mut s)?;
|
||||
len += 0u8.consensus_encode(&mut s)?;
|
||||
len += header.consensus_encode(w)?;
|
||||
len += 0u8.consensus_encode(w)?;
|
||||
}
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl Encodable for RawNetworkMessage {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += self.magic.consensus_encode(&mut s)?;
|
||||
len += self.command().consensus_encode(&mut s)?;
|
||||
len += self.magic.consensus_encode(w)?;
|
||||
len += self.command().consensus_encode(w)?;
|
||||
len += CheckedData(match self.payload {
|
||||
NetworkMessage::Version(ref dat) => serialize(dat),
|
||||
NetworkMessage::Addr(ref dat) => serialize(dat),
|
||||
|
|
@ -336,7 +337,7 @@ impl Encodable for RawNetworkMessage {
|
|||
| NetworkMessage::FilterClear
|
||||
| NetworkMessage::SendAddrV2 => vec![],
|
||||
NetworkMessage::Unknown { payload: ref data, .. } => serialize(data),
|
||||
}).consensus_encode(&mut s)?;
|
||||
}).consensus_encode(w)?;
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
|
@ -345,14 +346,14 @@ struct HeaderDeserializationWrapper(Vec<block::BlockHeader>);
|
|||
|
||||
impl Decodable for HeaderDeserializationWrapper {
|
||||
#[inline]
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let len = VarInt::consensus_decode(&mut d)?.0;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let len = VarInt::consensus_decode(r)?.0;
|
||||
// should be above usual number of items to avoid
|
||||
// allocation
|
||||
let mut ret = Vec::with_capacity(core::cmp::min(1024 * 16, len as usize));
|
||||
for _ in 0..len {
|
||||
ret.push(Decodable::consensus_decode(&mut d)?);
|
||||
if u8::consensus_decode(&mut d)? != 0u8 {
|
||||
ret.push(Decodable::consensus_decode(r)?);
|
||||
if u8::consensus_decode(r)? != 0u8 {
|
||||
return Err(encode::Error::ParseFailed("Headers message should not contain transactions"));
|
||||
}
|
||||
}
|
||||
|
|
@ -360,16 +361,16 @@ impl Decodable for HeaderDeserializationWrapper {
|
|||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_MSG_SIZE as u64))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(r.take(MAX_MSG_SIZE as u64).by_ref())
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for RawNetworkMessage {
|
||||
fn consensus_decode_from_finite_reader<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let magic = Decodable::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let cmd = CommandString::consensus_decode_from_finite_reader(&mut d)?;
|
||||
let raw_payload = CheckedData::consensus_decode_from_finite_reader(&mut d)?.0;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let magic = Decodable::consensus_decode_from_finite_reader(r)?;
|
||||
let cmd = CommandString::consensus_decode_from_finite_reader(r)?;
|
||||
let raw_payload = CheckedData::consensus_decode_from_finite_reader(r)?.0;
|
||||
|
||||
let mut mem_d = io::Cursor::new(raw_payload);
|
||||
let payload = match &cmd.0[..] {
|
||||
|
|
@ -419,8 +420,8 @@ impl Decodable for RawNetworkMessage {
|
|||
}
|
||||
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(d.take(MAX_MSG_SIZE as u64))
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Self::consensus_decode_from_finite_reader(r.take(MAX_MSG_SIZE as u64).by_ref())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ pub enum Inventory {
|
|||
|
||||
impl Encodable for Inventory {
|
||||
#[inline]
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
macro_rules! encode_inv {
|
||||
($code:expr, $item:expr) => {
|
||||
u32::consensus_encode(&$code, &mut s)? + $item.consensus_encode(&mut s)?
|
||||
u32::consensus_encode(&$code, w)? + $item.consensus_encode(w)?
|
||||
}
|
||||
}
|
||||
Ok(match *self {
|
||||
|
|
@ -74,18 +74,18 @@ impl Encodable for Inventory {
|
|||
|
||||
impl Decodable for Inventory {
|
||||
#[inline]
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let inv_type: u32 = Decodable::consensus_decode(&mut d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let inv_type: u32 = Decodable::consensus_decode(r)?;
|
||||
Ok(match inv_type {
|
||||
0 => Inventory::Error,
|
||||
1 => Inventory::Transaction(Decodable::consensus_decode(&mut d)?),
|
||||
2 => Inventory::Block(Decodable::consensus_decode(&mut d)?),
|
||||
5 => Inventory::WTx(Decodable::consensus_decode(&mut d)?),
|
||||
0x40000001 => Inventory::WitnessTransaction(Decodable::consensus_decode(&mut d)?),
|
||||
0x40000002 => Inventory::WitnessBlock(Decodable::consensus_decode(&mut d)?),
|
||||
1 => Inventory::Transaction(Decodable::consensus_decode(r)?),
|
||||
2 => Inventory::Block(Decodable::consensus_decode(r)?),
|
||||
5 => Inventory::WTx(Decodable::consensus_decode(r)?),
|
||||
0x40000001 => Inventory::WitnessTransaction(Decodable::consensus_decode(r)?),
|
||||
0x40000002 => Inventory::WitnessBlock(Decodable::consensus_decode(r)?),
|
||||
tp => Inventory::Unknown {
|
||||
inv_type: tp,
|
||||
hash: Decodable::consensus_decode(&mut d)?,
|
||||
hash: Decodable::consensus_decode(r)?,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ pub enum BloomFlags {
|
|||
}
|
||||
|
||||
impl Encodable for BloomFlags {
|
||||
fn consensus_encode<W: io::Write>(&self, mut e: W) -> Result<usize, io::Error> {
|
||||
e.write_all(&[match self {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
w.write_all(&[match self {
|
||||
BloomFlags::None => 0,
|
||||
BloomFlags::All => 1,
|
||||
BloomFlags::PubkeyOnly => 2,
|
||||
|
|
@ -45,8 +45,8 @@ impl Encodable for BloomFlags {
|
|||
}
|
||||
|
||||
impl Decodable for BloomFlags {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
Ok(match d.read_u8()? {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(match r.read_u8()? {
|
||||
0 => BloomFlags::None,
|
||||
1 => BloomFlags::All,
|
||||
2 => BloomFlags::PubkeyOnly,
|
||||
|
|
|
|||
|
|
@ -106,15 +106,15 @@ pub enum RejectReason {
|
|||
}
|
||||
|
||||
impl Encodable for RejectReason {
|
||||
fn consensus_encode<W: io::Write>(&self, mut e: W) -> Result<usize, io::Error> {
|
||||
e.write_all(&[*self as u8])?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
w.write_all(&[*self as u8])?;
|
||||
Ok(1)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for RejectReason {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
Ok(match d.read_u8()? {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(match r.read_u8()? {
|
||||
0x01 => RejectReason::Malformed,
|
||||
0x10 => RejectReason::Invalid,
|
||||
0x11 => RejectReason::Obsolete,
|
||||
|
|
|
|||
|
|
@ -355,23 +355,23 @@ impl PartialMerkleTree {
|
|||
}
|
||||
|
||||
impl Encodable for PartialMerkleTree {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
let ret = self.num_transactions.consensus_encode(&mut s)?
|
||||
+ self.hashes.consensus_encode(&mut s)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let ret = self.num_transactions.consensus_encode(w)?
|
||||
+ self.hashes.consensus_encode(w)?;
|
||||
let mut bytes: Vec<u8> = vec![0; (self.bits.len() + 7) / 8];
|
||||
for p in 0..self.bits.len() {
|
||||
bytes[p / 8] |= (self.bits[p] as u8) << (p % 8) as u8;
|
||||
}
|
||||
Ok(ret + bytes.consensus_encode(s)?)
|
||||
Ok(ret + bytes.consensus_encode(w)?)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for PartialMerkleTree {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let num_transactions: u32 = Decodable::consensus_decode(&mut d)?;
|
||||
let hashes: Vec<TxMerkleNode> = Decodable::consensus_decode(&mut d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let num_transactions: u32 = Decodable::consensus_decode(r)?;
|
||||
let hashes: Vec<TxMerkleNode> = Decodable::consensus_decode(r)?;
|
||||
|
||||
let bytes: Vec<u8> = Decodable::consensus_decode(d)?;
|
||||
let bytes: Vec<u8> = Decodable::consensus_decode(r)?;
|
||||
let mut bits: Vec<bool> = vec![false; bytes.len() * 8];
|
||||
|
||||
for (p, bit) in bits.iter_mut().enumerate() {
|
||||
|
|
@ -506,18 +506,18 @@ impl MerkleBlock {
|
|||
}
|
||||
|
||||
impl Encodable for MerkleBlock {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
let len = self.header.consensus_encode(&mut s)?
|
||||
+ self.txn.consensus_encode(s)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let len = self.header.consensus_encode(w)?
|
||||
+ self.txn.consensus_encode(w)?;
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for MerkleBlock {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(MerkleBlock {
|
||||
header: Decodable::consensus_decode(&mut d)?,
|
||||
txn: Decodable::consensus_decode(d)?,
|
||||
header: Decodable::consensus_decode(r)?,
|
||||
txn: Decodable::consensus_decode(r)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@ macro_rules! impl_psbt_serialize {
|
|||
macro_rules! impl_psbtmap_consensus_encoding {
|
||||
($thing:ty) => {
|
||||
impl $crate::consensus::Encodable for $thing {
|
||||
fn consensus_encode<S: $crate::io::Write>(
|
||||
fn consensus_encode<W: $crate::io::Write + ?Sized>(
|
||||
&self,
|
||||
s: S,
|
||||
w: &mut W,
|
||||
) -> Result<usize, $crate::io::Error> {
|
||||
self.consensus_encode_map(s)
|
||||
self.consensus_encode_map(w)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -68,13 +68,13 @@ macro_rules! impl_psbtmap_consensus_encoding {
|
|||
macro_rules! impl_psbtmap_consensus_decoding {
|
||||
($thing:ty) => {
|
||||
impl $crate::consensus::Decodable for $thing {
|
||||
fn consensus_decode<D: $crate::io::Read>(
|
||||
mut d: D,
|
||||
fn consensus_decode<R: $crate::io::Read + ?Sized>(
|
||||
r: &mut R,
|
||||
) -> Result<Self, $crate::consensus::encode::Error> {
|
||||
let mut rv: Self = ::core::default::Default::default();
|
||||
|
||||
loop {
|
||||
match $crate::consensus::Decodable::consensus_decode(&mut d) {
|
||||
match $crate::consensus::Decodable::consensus_decode(r) {
|
||||
Ok(pair) => rv.insert_pair(pair)?,
|
||||
Err($crate::consensus::encode::Error::Psbt($crate::util::psbt::Error::NoMorePairs)) => return Ok(rv),
|
||||
Err(e) => return Err(e),
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ impl Map for PartiallySignedTransaction {
|
|||
}
|
||||
|
||||
impl PartiallySignedTransaction {
|
||||
pub(crate) fn consensus_decode_global<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
let mut d = d.take(MAX_VEC_SIZE as u64);
|
||||
pub(crate) fn consensus_decode_global<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let mut r = r.take(MAX_VEC_SIZE as u64);
|
||||
let mut tx: Option<Transaction> = None;
|
||||
let mut version: Option<u32> = None;
|
||||
let mut unknowns: BTreeMap<raw::Key, Vec<u8>> = Default::default();
|
||||
|
|
@ -111,7 +111,7 @@ impl PartiallySignedTransaction {
|
|||
let mut proprietary: BTreeMap<raw::ProprietaryKey, Vec<u8>> = Default::default();
|
||||
|
||||
loop {
|
||||
match raw::Pair::consensus_decode(&mut d) {
|
||||
match raw::Pair::consensus_decode(&mut r) {
|
||||
Ok(pair) => {
|
||||
match pair.key.type_value {
|
||||
PSBT_GLOBAL_UNSIGNED_TX => {
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ pub(super) trait Map {
|
|||
fn get_pairs(&self) -> Result<Vec<raw::Pair>, io::Error>;
|
||||
|
||||
/// Encodes map data with bitcoin consensus encoding.
|
||||
fn consensus_encode_map<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode_map<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
for pair in Map::get_pairs(self)? {
|
||||
len += encode::Encodable::consensus_encode(&pair, &mut s)?;
|
||||
len += encode::Encodable::consensus_encode(&pair, w)?;
|
||||
}
|
||||
|
||||
Ok(len + encode::Encodable::consensus_encode(&0x00_u8, s)?)
|
||||
Ok(len + encode::Encodable::consensus_encode(&0x00_u8, w)?)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ use core::cmp;
|
|||
use crate::blockdata::script::Script;
|
||||
use crate::blockdata::transaction::{ TxOut, Transaction};
|
||||
use crate::consensus::{encode, Encodable, Decodable};
|
||||
use crate::consensus::encode::MAX_VEC_SIZE;
|
||||
pub use crate::util::sighash::Prevouts;
|
||||
|
||||
use crate::prelude::*;
|
||||
|
|
@ -278,20 +277,20 @@ mod display_from_str {
|
|||
pub use self::display_from_str::PsbtParseError;
|
||||
|
||||
impl Encodable for PartiallySignedTransaction {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += b"psbt".consensus_encode(&mut s)?;
|
||||
len += b"psbt".consensus_encode(w)?;
|
||||
|
||||
len += 0xff_u8.consensus_encode(&mut s)?;
|
||||
len += 0xff_u8.consensus_encode(w)?;
|
||||
|
||||
len += self.consensus_encode_map(&mut s)?;
|
||||
len += self.consensus_encode_map(w)?;
|
||||
|
||||
for i in &self.inputs {
|
||||
len += i.consensus_encode(&mut s)?;
|
||||
len += i.consensus_encode(w)?;
|
||||
}
|
||||
|
||||
for i in &self.outputs {
|
||||
len += i.consensus_encode(&mut s)?;
|
||||
len += i.consensus_encode(w)?;
|
||||
}
|
||||
|
||||
Ok(len)
|
||||
|
|
@ -299,19 +298,18 @@ impl Encodable for PartiallySignedTransaction {
|
|||
}
|
||||
|
||||
impl Decodable for PartiallySignedTransaction {
|
||||
fn consensus_decode<D: io::Read>(d: D) -> Result<Self, encode::Error> {
|
||||
let mut d = d.take(MAX_VEC_SIZE as u64);
|
||||
let magic: [u8; 4] = Decodable::consensus_decode(&mut d)?;
|
||||
fn consensus_decode_from_finite_reader<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let magic: [u8; 4] = Decodable::consensus_decode(r)?;
|
||||
|
||||
if *b"psbt" != magic {
|
||||
return Err(Error::InvalidMagic.into());
|
||||
}
|
||||
|
||||
if 0xff_u8 != u8::consensus_decode(&mut d)? {
|
||||
if 0xff_u8 != u8::consensus_decode(r)? {
|
||||
return Err(Error::InvalidSeparator.into());
|
||||
}
|
||||
|
||||
let mut global = PartiallySignedTransaction::consensus_decode_global(&mut d)?;
|
||||
let mut global = PartiallySignedTransaction::consensus_decode_global(r)?;
|
||||
global.unsigned_tx_checks()?;
|
||||
|
||||
let inputs: Vec<Input> = {
|
||||
|
|
@ -320,7 +318,7 @@ impl Decodable for PartiallySignedTransaction {
|
|||
let mut inputs: Vec<Input> = Vec::with_capacity(inputs_len);
|
||||
|
||||
for _ in 0..inputs_len {
|
||||
inputs.push(Decodable::consensus_decode(&mut d)?);
|
||||
inputs.push(Decodable::consensus_decode(r)?);
|
||||
}
|
||||
|
||||
inputs
|
||||
|
|
@ -332,7 +330,7 @@ impl Decodable for PartiallySignedTransaction {
|
|||
let mut outputs: Vec<Output> = Vec::with_capacity(outputs_len);
|
||||
|
||||
for _ in 0..outputs_len {
|
||||
outputs.push(Decodable::consensus_decode(&mut d)?);
|
||||
outputs.push(Decodable::consensus_decode(r)?);
|
||||
}
|
||||
|
||||
outputs
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ impl fmt::Display for Key {
|
|||
}
|
||||
|
||||
impl Decodable for Key {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let VarInt(byte_size): VarInt = Decodable::consensus_decode(&mut d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let VarInt(byte_size): VarInt = Decodable::consensus_decode(r)?;
|
||||
|
||||
if byte_size == 0 {
|
||||
return Err(Error::NoMorePairs.into());
|
||||
|
|
@ -96,11 +96,11 @@ impl Decodable for Key {
|
|||
})
|
||||
}
|
||||
|
||||
let type_value: u8 = Decodable::consensus_decode(&mut d)?;
|
||||
let type_value: u8 = Decodable::consensus_decode(r)?;
|
||||
|
||||
let mut key = Vec::with_capacity(key_byte_size as usize);
|
||||
for _ in 0..key_byte_size {
|
||||
key.push(Decodable::consensus_decode(&mut d)?);
|
||||
key.push(Decodable::consensus_decode(r)?);
|
||||
}
|
||||
|
||||
Ok(Key { type_value, key })
|
||||
|
|
@ -108,14 +108,14 @@ impl Decodable for Key {
|
|||
}
|
||||
|
||||
impl Encodable for Key {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = 0;
|
||||
len += VarInt((self.key.len() + 1) as u64).consensus_encode(&mut s)?;
|
||||
len += VarInt((self.key.len() + 1) as u64).consensus_encode(w)?;
|
||||
|
||||
len += self.type_value.consensus_encode(&mut s)?;
|
||||
len += self.type_value.consensus_encode(w)?;
|
||||
|
||||
for key in &self.key {
|
||||
len += key.consensus_encode(&mut s)?
|
||||
len += key.consensus_encode(w)?
|
||||
}
|
||||
|
||||
Ok(len)
|
||||
|
|
@ -123,36 +123,36 @@ impl Encodable for Key {
|
|||
}
|
||||
|
||||
impl Encodable for Pair {
|
||||
fn consensus_encode<S: io::Write>(&self, mut s: S) -> Result<usize, io::Error> {
|
||||
let len = self.key.consensus_encode(&mut s)?;
|
||||
Ok(len + self.value.consensus_encode(s)?)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let len = self.key.consensus_encode(w)?;
|
||||
Ok(len + self.value.consensus_encode(w)?)
|
||||
}
|
||||
}
|
||||
|
||||
impl Decodable for Pair {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
Ok(Pair {
|
||||
key: Decodable::consensus_decode(&mut d)?,
|
||||
value: Decodable::consensus_decode(d)?,
|
||||
key: Decodable::consensus_decode(r)?,
|
||||
value: Decodable::consensus_decode(r)?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl<Subtype> Encodable for ProprietaryKey<Subtype> where Subtype: Copy + From<u8> + Into<u8> {
|
||||
fn consensus_encode<W: io::Write>(&self, mut e: W) -> Result<usize, io::Error> {
|
||||
let mut len = self.prefix.consensus_encode(&mut e)? + 1;
|
||||
e.emit_u8(self.subtype.into())?;
|
||||
e.write_all(&self.key)?;
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
let mut len = self.prefix.consensus_encode(w)? + 1;
|
||||
w.emit_u8(self.subtype.into())?;
|
||||
w.write_all(&self.key)?;
|
||||
len += self.key.len();
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl<Subtype> Decodable for ProprietaryKey<Subtype> where Subtype: Copy + From<u8> + Into<u8> {
|
||||
fn consensus_decode<D: io::Read>(mut d: D) -> Result<Self, encode::Error> {
|
||||
let prefix = Vec::<u8>::consensus_decode(&mut d)?;
|
||||
let subtype = Subtype::from(d.read_u8()?);
|
||||
let key = read_to_end(d)?;
|
||||
fn consensus_decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, encode::Error> {
|
||||
let prefix = Vec::<u8>::consensus_decode(r)?;
|
||||
let subtype = Subtype::from(r.read_u8()?);
|
||||
let key = read_to_end(r)?;
|
||||
|
||||
Ok(ProprietaryKey { prefix, subtype, key })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -815,8 +815,8 @@ impl<'a> Annex<'a> {
|
|||
}
|
||||
|
||||
impl<'a> Encodable for Annex<'a> {
|
||||
fn consensus_encode<W: io::Write>(&self, writer: W) -> Result<usize, io::Error> {
|
||||
encode::consensus_encode_with_size(self.0, writer)
|
||||
fn consensus_encode<W: io::Write + ?Sized>(&self, w: &mut W) -> Result<usize, io::Error> {
|
||||
encode::consensus_encode_with_size(self.0, w)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -419,27 +419,27 @@ macro_rules! construct_uint {
|
|||
|
||||
impl $crate::consensus::Encodable for $name {
|
||||
#[inline]
|
||||
fn consensus_encode<S: $crate::io::Write>(
|
||||
fn consensus_encode<W: $crate::io::Write + ?Sized>(
|
||||
&self,
|
||||
mut s: S,
|
||||
w: &mut W,
|
||||
) -> Result<usize, $crate::io::Error> {
|
||||
let &$name(ref data) = self;
|
||||
let mut len = 0;
|
||||
for word in data.iter() {
|
||||
len += word.consensus_encode(&mut s)?;
|
||||
len += word.consensus_encode(w)?;
|
||||
}
|
||||
Ok(len)
|
||||
}
|
||||
}
|
||||
|
||||
impl $crate::consensus::Decodable for $name {
|
||||
fn consensus_decode<D: $crate::io::Read>(
|
||||
mut d: D,
|
||||
fn consensus_decode<R: $crate::io::Read + ?Sized>(
|
||||
r: &mut R,
|
||||
) -> Result<$name, $crate::consensus::encode::Error> {
|
||||
use $crate::consensus::Decodable;
|
||||
let mut ret: [u64; $n_words] = [0; $n_words];
|
||||
for i in 0..$n_words {
|
||||
ret[i] = Decodable::consensus_decode(&mut d)?;
|
||||
ret[i] = Decodable::consensus_decode(r)?;
|
||||
}
|
||||
Ok($name(ret))
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue