Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/qa/rpc-tests/reindex.py
+++ b/qa/rpc-tests/reindex.py
@@ -6,9 +6,11 @@
 #
 # Test -reindex with CheckBlockIndex
 #
+
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
-import os.path
+from test_framework.util import assert_equal, initialize_chain_clean, \
+    start_node, stop_node, wait_bitcoinds
+

 class ReindexTest(BitcoinTestFramework):