From 8a55909bef5e7a34b1f95a56658ce679616c3b5e Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 14 Dec 2015 11:05:40 +0100 Subject: [PATCH] fixes after the merge --- src/blockchain.rs | 2 +- src/genesis.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blockchain.rs b/src/blockchain.rs index fa6ff1782..075177b33 100644 --- a/src/blockchain.rs +++ b/src/blockchain.rs @@ -107,7 +107,7 @@ impl BlockChain { let mut block = Block::new(db.clone()); // TODO: commit //block.mutable_state().insert_accounts(&self.genesis_state); - block.mutable_state().commit_db(); + block.mutable_state().db().commit(); // TODO: set previous block // TODO: reset current block diff --git a/src/genesis.rs b/src/genesis.rs index 64889ce27..cc405fc82 100644 --- a/src/genesis.rs +++ b/src/genesis.rs @@ -87,7 +87,7 @@ impl Genesis { let addr = Address::from_str(address).unwrap(); let o = acc.as_object().unwrap(); let balance = U256::from_dec_str(o["balance"].as_string().unwrap()).unwrap(); - state.insert(addr, Account::new_with_balance(balance)); + state.insert(addr, Account::new_basic(balance)); } Genesis {