From 884bfa1b9e47296c2ac45624be76401f0dbf9a73 Mon Sep 17 00:00:00 2001
From: quake wang <quake.wang@gmail.com>
Date: Fri, 12 Apr 2019 20:30:03 +0900
Subject: [PATCH] chore: rebase develop

---
 sync/src/relayer/block_transactions_process.rs     | 2 +-
 sync/src/relayer/get_block_proposal_process.rs     | 2 +-
 sync/src/relayer/get_block_transactions_process.rs | 2 +-
 sync/src/relayer/mod.rs                            | 9 +++------
 sync/src/synchronizer/block_process.rs             | 2 +-
 sync/src/synchronizer/get_blocks_process.rs        | 2 +-
 sync/src/synchronizer/get_headers_process.rs       | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/sync/src/relayer/block_transactions_process.rs b/sync/src/relayer/block_transactions_process.rs
index 13a83234ba..bb26c9ff58 100644
--- a/sync/src/relayer/block_transactions_process.rs
+++ b/sync/src/relayer/block_transactions_process.rs
@@ -2,7 +2,7 @@ use crate::relayer::Relayer;
 use ckb_core::transaction::Transaction;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{cast, BlockTransactions, FlatbuffersVectorIterator};
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use std::convert::TryInto;
 use std::sync::Arc;
diff --git a/sync/src/relayer/get_block_proposal_process.rs b/sync/src/relayer/get_block_proposal_process.rs
index fb415604c7..72d5a3d579 100644
--- a/sync/src/relayer/get_block_proposal_process.rs
+++ b/sync/src/relayer/get_block_proposal_process.rs
@@ -1,7 +1,7 @@
 use crate::relayer::Relayer;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{cast, GetBlockProposal, RelayMessage};
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use flatbuffers::FlatBufferBuilder;
 use log::warn;
diff --git a/sync/src/relayer/get_block_transactions_process.rs b/sync/src/relayer/get_block_transactions_process.rs
index 17aca955f1..f9bd9a6a4c 100644
--- a/sync/src/relayer/get_block_transactions_process.rs
+++ b/sync/src/relayer/get_block_transactions_process.rs
@@ -1,7 +1,7 @@
 use crate::relayer::Relayer;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{cast, GetBlockTransactions, RelayMessage};
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use flatbuffers::FlatBufferBuilder;
 use log::{debug, warn};
diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs
index 5cae6fe586..9b06b7dcd0 100644
--- a/sync/src/relayer/mod.rs
+++ b/sync/src/relayer/mod.rs
@@ -51,10 +51,7 @@ pub struct Relayer<CS> {
     peers: Arc<Peers>,
 }
 
-impl<CI> Clone for Relayer<CI>
-where
-    CI: ckb_shared::index::ChainIndex,
-{
+impl<CS: ChainStore> Clone for Relayer<CS> {
     fn clone(&self) -> Self {
         Relayer {
             chain: self.chain.clone(),
@@ -65,8 +62,8 @@ where
     }
 }
 
-impl<CI: ChainIndex> Relayer<CI> {
-    pub fn new(chain: ChainController, shared: Shared<CI>, peers: Arc<Peers>) -> Self {
+impl<CS: ChainStore> Relayer<CS> {
+    pub fn new(chain: ChainController, shared: Shared<CS>, peers: Arc<Peers>) -> Self {
         Relayer {
             chain,
             shared,
diff --git a/sync/src/synchronizer/block_process.rs b/sync/src/synchronizer/block_process.rs
index 0eaec7e303..320700555b 100644
--- a/sync/src/synchronizer/block_process.rs
+++ b/sync/src/synchronizer/block_process.rs
@@ -2,7 +2,7 @@ use crate::synchronizer::Synchronizer;
 use ckb_core::block::Block;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::Block as PBlock;
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use log::debug;
 use std::convert::TryInto;
diff --git a/sync/src/synchronizer/get_blocks_process.rs b/sync/src/synchronizer/get_blocks_process.rs
index ad144be6e1..c50ecdc912 100644
--- a/sync/src/synchronizer/get_blocks_process.rs
+++ b/sync/src/synchronizer/get_blocks_process.rs
@@ -1,7 +1,7 @@
 use crate::synchronizer::Synchronizer;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{cast, GetBlocks, SyncMessage};
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use flatbuffers::FlatBufferBuilder;
 use log::{debug, warn};
diff --git a/sync/src/synchronizer/get_headers_process.rs b/sync/src/synchronizer/get_headers_process.rs
index 024faf32b0..61e9cac6b2 100644
--- a/sync/src/synchronizer/get_headers_process.rs
+++ b/sync/src/synchronizer/get_headers_process.rs
@@ -3,7 +3,7 @@ use crate::MAX_LOCATOR_SIZE;
 use ckb_core::header::Header;
 use ckb_network::{Behaviour, CKBProtocolContext, PeerIndex};
 use ckb_protocol::{cast, GetHeaders, SyncMessage};
-use ckb_shared::index::ChainIndex;
+use ckb_shared::store::ChainStore;
 use failure::Error as FailureError;
 use flatbuffers::FlatBufferBuilder;
 use log::{debug, info, warn};