Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build warning sync (#2416)

Browse source 
* sync state no longer need in adapters

* rustfmt
This commit is contained in:
Antioch Peverell 2019-01-18 21:40:48 +00:00 committed by GitHub
parent 7ea370d33a
commit 8c4d14f654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
servers/src/common/adapters.rs
View file

@ -210,7 +210,9 @@ impl p2p::ChainAdapter for NetToChainAdapter {
// pushing the new block header through the header chain pipeline
// we will go ask for the block if this is a new header
let res = self.chain().process_block_header(&bh, self.chain_opts(false));
let res = self
.chain()
.process_block_header(&bh, self.chain_opts(false));
if let &Err(ref e) = &res {
debug!("Block header {} refused by chain: {:?}", bhash, e.kind());
@ -434,7 +436,10 @@ impl NetToChainAdapter {
let bhash = b.hash();
let previous = self.chain().get_previous_header(&b.header);
match self.chain().process_block(b, self.chain_opts(was_requested)) {
match self
.chain()
.process_block(b, self.chain_opts(was_requested))
{
Ok(_) => {
self.validate_chain(bhash);
self.check_compact();
@ -601,7 +606,6 @@ impl NetToChainAdapter {
/// accepted a new block, asking the pool to update its state and
/// the network to broadcast the block
pub struct ChainToPoolAndNetAdapter {
sync_state: Arc<SyncState>,
tx_pool: Arc<RwLock<pool::TransactionPool>>,
peers: OneTime<Weak<p2p::Peers>>,
}
@ -671,12 +675,8 @@ impl ChainAdapter for ChainToPoolAndNetAdapter {
impl ChainToPoolAndNetAdapter {
/// Construct a ChainToPoolAndNetAdapter instance.
pub fn new(
sync_state: Arc<SyncState>,
tx_pool: Arc<RwLock<pool::TransactionPool>>,
) -> ChainToPoolAndNetAdapter {
pub fn new(tx_pool: Arc<RwLock<pool::TransactionPool>>) -> ChainToPoolAndNetAdapter {
ChainToPoolAndNetAdapter {
sync_state,
tx_pool,
peers: OneTime::new(),
}

5
servers/src/grin/server.rs
View file

@ -128,10 +128,7 @@ impl Server {
let sync_state = Arc::new(SyncState::new());
let chain_adapter = Arc::new(ChainToPoolAndNetAdapter::new(
sync_state.clone(),
tx_pool.clone(),
));
let chain_adapter = Arc::new(ChainToPoolAndNetAdapter::new(tx_pool.clone()));
let genesis = match config.chain_type {
global::ChainTypes::AutomatedTesting => genesis::genesis_dev(),