From 1737bb83545918b90bf688aea0f84a9b89af96d9 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Thu, 10 Nov 2016 07:41:56 +0900 Subject: [PATCH] Move some code back to correct place Fixes #12 --- server/block_processor.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/server/block_processor.py b/server/block_processor.py index 2238aae..1eee6b1 100644 --- a/server/block_processor.py +++ b/server/block_processor.py @@ -536,6 +536,9 @@ class BlockProcessor(server.db.DB): self.height - self.db_height)) self.utxo_cache.flush(batch) self.utxo_flush_count = self.flush_count + self.db_tx_count = self.tx_count + self.db_height = self.height + self.db_tip = self.tip def assert_flushed(self): '''Asserts state is fully flushed.''' @@ -573,13 +576,6 @@ class BlockProcessor(server.db.DB): self.flush_state(batch) self.logger.info('committing transaction...') - # Update our in-memory state after successful flush - self.db_tx_count = self.tx_count - self.db_height = self.height - self.db_tip = self.tip - self.tx_hashes = [] - self.headers = [] - # Update and put the wall time again - otherwise we drop the # time it took to commit the batch self.flush_state(self.db) @@ -671,6 +667,8 @@ class BlockProcessor(server.db.DB): os.sync() + self.tx_hashes = [] + self.headers = [] self.logger.info('FS flush took {:.1f} seconds' .format(time.time() - flush_start))