From ef164376a3fbfa822a03bcd40381ffe04a21e99a Mon Sep 17 00:00:00 2001
From: jjy <jjyruby@gmail.com>
Date: Fri, 12 Apr 2019 00:48:00 +0800
Subject: [PATCH] fix: tx-valid-since rebase

---
 chain/src/chain.rs                        | 1 -
 shared/src/chain_state.rs                 | 4 +++-
 shared/src/shared.rs                      | 3 +--
 shared/src/tests/shared.rs                | 5 +----
 sync/src/relayer/compact_block_process.rs | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/chain/src/chain.rs b/chain/src/chain.rs
index 1636a9137c..8950c78946 100644
--- a/chain/src/chain.rs
+++ b/chain/src/chain.rs
@@ -7,7 +7,6 @@ use ckb_core::extras::BlockExt;
 use ckb_core::service::{Request, DEFAULT_CHANNEL_SIZE, SIGNAL_CHANNEL_SIZE};
 use ckb_core::transaction::ProposalShortId;
 use ckb_core::{header::Header, BlockNumber};
-use ckb_db::batch::Batch;
 use ckb_notify::NotifyController;
 use ckb_shared::cell_set::CellSetDiff;
 use ckb_shared::chain_state::ChainState;
diff --git a/shared/src/chain_state.rs b/shared/src/chain_state.rs
index d983bf1548..a47f54ec5e 100644
--- a/shared/src/chain_state.rs
+++ b/shared/src/chain_state.rs
@@ -43,7 +43,9 @@ impl<CI: ChainIndex> ChainState<CI> {
             match store.get_tip_header() {
                 Some(h) => h,
                 None => {
-                    store.init(&genesis);
+                    store
+                        .init(&genesis)
+                        .expect("init genesis block should be ok");
                     genesis.header().clone()
                 }
             }
diff --git a/shared/src/shared.rs b/shared/src/shared.rs
index a53628448d..96f4a7d03d 100644
--- a/shared/src/shared.rs
+++ b/shared/src/shared.rs
@@ -1,4 +1,3 @@
-use crate::cell_set::CellSet;
 use crate::chain_state::ChainState;
 use crate::error::SharedError;
 use crate::index::ChainIndex;
@@ -12,7 +11,7 @@ use ckb_core::header::{BlockNumber, Header};
 use ckb_core::transaction::{Capacity, ProposalShortId, Transaction};
 use ckb_core::uncle::UncleBlock;
 use ckb_db::{CacheDB, DBConfig, KeyValueDB, MemoryKeyValueDB, RocksDB};
-use ckb_traits::{BlockMedianTimeContext, ChainProvider};
+use ckb_traits::ChainProvider;
 use ckb_util::Mutex;
 use failure::Error;
 use numext_fixed_hash::H256;
diff --git a/shared/src/tests/shared.rs b/shared/src/tests/shared.rs
index 7487513dc0..a246f843f7 100644
--- a/shared/src/tests/shared.rs
+++ b/shared/src/tests/shared.rs
@@ -32,12 +32,9 @@ where
     let mut batch = store.new_batch().unwrap();
     for b in blocks {
         batch.insert_block(&b).unwrap();
-        batch
-            .insert_block_hash(b.header().number(), &b.header().hash())
-            .unwrap();
+        batch.attach_block(&b).unwrap();
     }
     batch.commit().unwrap();
-    hashes
 }
 
 #[test]
diff --git a/sync/src/relayer/compact_block_process.rs b/sync/src/relayer/compact_block_process.rs
index f04c10de07..f4e8ce7113 100644
--- a/sync/src/relayer/compact_block_process.rs
+++ b/sync/src/relayer/compact_block_process.rs
@@ -112,7 +112,7 @@ struct CompactBlockMedianTimeView<'a, CI> {
 
 impl<'a, CI> ::std::clone::Clone for CompactBlockMedianTimeView<'a, CI>
 where
-    CI: ChainIndex + 'static,
+    CI: ChainIndex,
 {
     fn clone(&self) -> Self {
         CompactBlockMedianTimeView {
@@ -125,7 +125,7 @@ where
 
 impl<'a, CI> CompactBlockMedianTimeView<'a, CI>
 where
-    CI: ChainIndex + 'static,
+    CI: ChainIndex,
 {
     fn get_header(&self, hash: &H256) -> Option<Header> {
         self.pending_compact_blocks