From 3c162ac867404951011b1caf9f7b4ec3848ec33d Mon Sep 17 00:00:00 2001 From: NikVolf Date: Thu, 15 Dec 2016 14:33:17 +0100 Subject: [PATCH] best block resolve fix --- db/src/storage.rs | 4 ++-- db/src/transaction_meta.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/src/storage.rs b/db/src/storage.rs index 9d4d7307..58c7b97b 100644 --- a/db/src/storage.rs +++ b/db/src/storage.rs @@ -156,8 +156,8 @@ impl Storage { if best_number.is_some() { *storage.best_block.write() = Some( BestBlock { - number: best_number.expect("is_some() is checked above for block number"), - hash: best_hash.expect("is_some() is checked above for block hash"), + number: best_number.expect("best.number.is_some() is checked above; qed"), + hash: best_hash.expect("best_number.is_some() is equal to best_hash.is_some(); best_number.is_some() = true checked above; so best_hash.is_some() is also true; qed"), } ); } diff --git a/db/src/transaction_meta.rs b/db/src/transaction_meta.rs index ddbd9d67..f941f247 100644 --- a/db/src/transaction_meta.rs +++ b/db/src/transaction_meta.rs @@ -70,7 +70,7 @@ impl TransactionMeta { } pub fn is_spent(&self, idx: usize) -> Option { - self.bits.get(idx + 1) //.expect("Index should be verified by the caller") + self.bits.get(idx + 1) } pub fn is_fully_spent(&self) -> bool {