From df0dc918919146d2a9ac0191b13b5bcbb86f72f1 Mon Sep 17 00:00:00 2001 From: Antioch Peverell Date: Thu, 11 Oct 2018 12:28:07 +0100 Subject: [PATCH] Chain init reset sync head (#1724) * fix: binary auto release feature broken (#1714) * fix a mistake on script * reset_sync_head on setup_head, no need for reset_head --- .travis.yml | 2 +- chain/src/chain.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85c4fe154..4fd04be3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ script: fi; before_deploy: - - if [[ "TEST_SUITE" == "pool-p2p" ]]; then + - if [[ "$TEST_SUITE" == "pool-p2p" ]]; then cargo clean && cargo build --release && ./.auto-release.sh; fi diff --git a/chain/src/chain.rs b/chain/src/chain.rs index db5285cf8..4f790bb84 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -1056,8 +1056,8 @@ fn setup_head( Err(e) => return Err(ErrorKind::StoreErr(e, "chain init load head".to_owned()))?, }; - // Initialize header_head and sync_head as necessary for chain init. - batch.reset_head()?; + // Reset sync_head to be consistent with current header_head. + batch.reset_sync_head()?; batch.commit()?; Ok(())