Configurable path for chain db. Lowered test cuckoo size.

chain/src/lib.rs

@@ -35,5 +35,5 @@ pub mod types;
 
 // Re-export the base interface
 
-pub use types::{ChainStore, State, Tip};
+pub use types::{ChainStore, Tip};
 pub use pipe::{NONE, process_block};

chain/src/pipe.rs

@@ -102,14 +102,17 @@ fn validate_header(b: &Block, ctx: &mut BlockContext) -> Result<(), Error> {
 	let prev = try!(ctx.store.get_block_header(&header.previous).map_err(&Error::StoreErr));
 
 	if header.timestamp <= prev.timestamp {
-    // prevent time warp attacks and some timestamp manipulations by forcing strict time progression
+		// prevent time warp attacks and some timestamp manipulations by forcing strict
+		// time progression
 		return Err(Error::InvalidBlockTime);
 	}
-  if header.timestamp > time::now() + time::Duration::seconds(12*(consensus::BLOCK_TIME_SEC as i64)) {
+	if header.timestamp >
-    // refuse blocks too far in future, constant of 12 comes from bitcoin (2h worth of blocks)
+	   time::now() + time::Duration::seconds(12 * (consensus::BLOCK_TIME_SEC as i64)) {
-    // TODO add warning in p2p code if local time is too different from peers
+		// refuse blocks too far in future, constant of 12 comes from bitcoin (2h worth
+		// of blocks)
+		// TODO add warning in p2p code if local time is too different from peers
 		return Err(Error::InvalidBlockTime);
-  }
+	}
 
 	let (diff_target, cuckoo_sz) = consensus::next_target(header.timestamp.to_timespec().sec,
 	                                                      prev.timestamp.to_timespec().sec,
@@ -120,7 +123,7 @@ fn validate_header(b: &Block, ctx: &mut BlockContext) -> Result<(), Error> {
 	}
 
 	if ctx.opts.intersects(EASY_POW) {
-		if !pow::verify20(b) {
+		if !pow::verify_size(b, 15) {
 			return Err(Error::InvalidPow);
 		}
 	} else if !pow::verify_size(b, cuckoo_sz as u32) {

chain/src/store.rs

@@ -21,7 +21,7 @@ use core::core::hash::Hash;
 use core::core::{Block, BlockHeader};
 use grin_store;
 
-const STORE_PATH: &'static str = ".grin/chain";
+const STORE_SUBPATH: &'static str = "chain";
 
 const SEP: u8 = ':' as u8;
 
@@ -37,8 +37,9 @@ pub struct ChainKVStore {
 }
 
 impl ChainKVStore {
-	pub fn new() -> Result<ChainKVStore, Error> {
+	pub fn new(root_path: String) -> Result<ChainKVStore, Error> {
-		let db = try!(grin_store::Store::open(STORE_PATH).map_err(to_store_err));
+		let db = try!(grin_store::Store::open(format!("{}/{}", root_path, STORE_SUBPATH).as_str())
+			.map_err(to_store_err));
 		Ok(ChainKVStore { db: db })
 	}
 }
@@ -48,10 +49,10 @@ impl ChainStore for ChainKVStore {
 		option_to_not_found(self.db.get_ser(&vec![HEAD_PREFIX]))
 	}
 
-  fn head_header(&self) -> Result<BlockHeader, Error> {
+	fn head_header(&self) -> Result<BlockHeader, Error> {
 		let head: Tip = try!(option_to_not_found(self.db.get_ser(&vec![HEAD_PREFIX])));
-    self.get_block_header(&head.last_block_h)
+		self.get_block_header(&head.last_block_h)
-  }
+	}
 
 	fn save_block(&self, b: &Block) -> Result<(), Error> {
 		try!(self.db

chain/src/types.rs

@@ -131,20 +131,14 @@ pub enum Error {
 	StorageErr(String),
 }
 
-#[derive(Debug, Clone)]
-pub struct State {
-  pub head: Tip,
-  pub forks: Vec<Tip>,
-}
-
 /// Trait the chain pipeline requires an implementor for in order to process
 /// blocks.
-pub trait ChainStore {
+pub trait ChainStore: Send {
 	/// Get the tip that's also the head of the chain
 	fn head(&self) -> Result<Tip, Error>;
 
-  /// Block header for the chain head
+	/// Block header for the chain head
-  fn head_header(&self) -> Result<BlockHeader, Error>;
+	fn head_header(&self) -> Result<BlockHeader, Error>;
 
 	/// Gets a block header by hash
 	fn get_block_header(&self, h: &Hash) -> Result<BlockHeader, Error>;
@@ -158,4 +152,3 @@ pub trait ChainStore {
 	/// Save the provided tip without setting it as head
 	fn save_tip(&self, t: &Tip) -> Result<(), Error>;
 }
-

chain/tests/mine_simple_chain.rs

@@ -28,7 +28,7 @@ use grin_core::consensus;
 fn mine_empty_chain() {
   let curve = secp::Secp256k1::with_caps(secp::ContextFlag::Commit);
 	let mut rng = OsRng::new().unwrap();
-	let store = grin_chain::store::ChainKVStore::new().unwrap();
+	let store = grin_chain::store::ChainKVStore::new(".grin".to_string()).unwrap();
 
   // save a genesis block
   let gen = grin_core::genesis::genesis(); 
@@ -47,7 +47,7 @@ fn mine_empty_chain() {
     let mut b = core::Block::new(prev.header, vec![], reward_key).unwrap();
     println!("=> {} {:?}", b.header.height, b.verify(&curve));
 
-    let (proof, nonce) = pow::pow20(&b, consensus::MAX_TARGET).unwrap();
+    let (proof, nonce) = pow::pow_size(&b, consensus::MAX_TARGET, 15).unwrap();
     b.header.pow = proof;
     b.header.nonce = nonce;
     grin_chain::pipe::process_block(&b, &store, grin_chain::pipe::EASY_POW).unwrap();