core: move remaining contents of core/ser.rs into ser.rs

mimblewimble · Oct 23, 2016 · afc5b9d · afc5b9d
1 parent 8b1c4eb
commit afc5b9d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 62 deletions.
diff --git a/core/src/core/block.rs b/core/src/core/block.rs
@@ -25,7 +25,6 @@ use core::{Input, Output, Proof, TxProof, Transaction};
 use core::transaction::merkle_inputs_outputs;
 use core::{PROOFSIZE, REWARD};
 use core::hash::{Hash, Hashed, ZERO_HASH};
-use core::ser::MAX_IN_OUT_LEN;
 use ser::{self, Readable, Reader, Writeable, Writer, ser_vec};
 
 /// Block header, fairly standard compared to other blockchains.
@@ -140,7 +139,7 @@ impl Readable<Block> for Block {
 		let input_len = try!(reader.read_u64());
 		let output_len = try!(reader.read_u64());
 		let proof_len = try!(reader.read_u64());
-		if input_len > MAX_IN_OUT_LEN || output_len > MAX_IN_OUT_LEN || proof_len > MAX_IN_OUT_LEN {
+		if input_len > ser::MAX_IN_OUT_LEN || output_len > ser::MAX_IN_OUT_LEN || proof_len > ser::MAX_IN_OUT_LEN {
 			return Err(ser::Error::TooLargeReadErr("Too many inputs, outputs or proofs.".to_string()));
 		}
 

diff --git a/core/src/core/mod.rs b/core/src/core/mod.rs
@@ -19,7 +19,6 @@ pub mod hash;
 pub mod transaction;
 #[allow(dead_code)]
 #[macro_use]
-mod ser;
 
 pub use self::block::{Block, BlockHeader};
 pub use self::transaction::{Transaction, Input, Output, TxProof};

diff --git a/core/src/core/ser.rs b/core/src/core/ser.rs
diff --git a/core/src/core/transaction.rs b/core/src/core/transaction.rs
@@ -17,7 +17,6 @@
 use core::Committed;
 use core::MerkleRow;
 use core::hash::{Hashed, Hash};
-use core::ser::MAX_IN_OUT_LEN;
 use ser::{self, Reader, Writer, Readable, Writeable};
 
 use secp::{self, Secp256k1, Message, Signature};
@@ -91,7 +90,7 @@ impl Readable<Transaction> for Transaction {
 		let output_len = try!(reader.read_u64());
 
 		// in case a facetious miner sends us more than what we can allocate
-		if input_len > MAX_IN_OUT_LEN || output_len > MAX_IN_OUT_LEN {
+		if input_len > ser::MAX_IN_OUT_LEN || output_len > ser::MAX_IN_OUT_LEN {
 			return Err(ser::Error::TooLargeReadErr("Too many inputs or outputs.".to_string()));
 		}
 

diff --git a/core/src/ser.rs b/core/src/ser.rs
@@ -23,6 +23,9 @@ use std::io;
 use std::io::{Write, Read};
 use byteorder::{ReadBytesExt, WriteBytesExt, BigEndian};
 
+/// Maximum number of inputs or outputs in a transaction
+pub const MAX_IN_OUT_LEN: u64 = 50000;
+
 /// Possible errors deriving from serializing or deserializing.
 #[derive(Debug)]
 pub enum Error {
@@ -170,3 +173,31 @@ impl<'a> Writer for BinWriter<'a> {
 		self.sink.write_all(bs).err().map(Error::IOErr)
 	}
 }
+
+macro_rules! impl_slice_bytes {
+  ($byteable: ty) => {
+    impl AsFixedBytes for $byteable {
+      fn as_fixed_bytes(&self) -> &[u8] {
+        &self[..]
+      }
+    }
+  }
+}
+
+impl_slice_bytes!(::secp::key::SecretKey);
+impl_slice_bytes!(::secp::Signature);
+impl_slice_bytes!(::secp::pedersen::Commitment);
+impl_slice_bytes!(Vec<u8>);
+
+impl AsFixedBytes for ::core::hash::Hash {
+	fn as_fixed_bytes(&self) -> &[u8] {
+		self.to_slice()
+	}
+}
+
+impl AsFixedBytes for ::secp::pedersen::RangeProof {
+	fn as_fixed_bytes(&self) -> &[u8] {
+		&self.bytes()
+	}
+}
+