functional_tests: pop exactly what we need to test before testing

tests/functional_tests/blockchain.py

@@ -53,7 +53,8 @@ class BlockchainTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def _test_generateblocks(self, blocks):

tests/functional_tests/cold_signing.py

@@ -45,7 +45,8 @@ class ColdSigningTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self, idx):

tests/functional_tests/get_output_distribution.py

@@ -44,7 +44,8 @@ class GetOutputDistributionTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self):

tests/functional_tests/mining.py

@@ -53,7 +53,8 @@ class MiningTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self):

tests/functional_tests/multisig.py

@@ -81,7 +81,8 @@ class MultisigTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def mine(self, address, blocks):

tests/functional_tests/proofs.py

@@ -50,7 +50,8 @@ class ProofsTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def mine(self, address, blocks):

tests/functional_tests/speed.py

@@ -50,7 +50,8 @@ class SpeedTest():
     def reset(self):
         print 'Resetting blockchain'
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def run_test(self):

tests/functional_tests/transfer.py

@@ -56,7 +56,8 @@ class TransferTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self):

tests/functional_tests/txpool.py

@@ -46,7 +46,8 @@ class TransferTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self):

tests/functional_tests/wallet.py

@@ -74,7 +74,8 @@ class WalletTest():
     def reset(self):
         print('Resetting blockchain')
         daemon = Daemon()
-        daemon.pop_blocks(1000)
+        res = daemon.get_height()
+        daemon.pop_blocks(res.height - 1)
         daemon.flush_txpool()
 
     def create(self):