fixup functional test

Author: instagibbs

Diff for: test/functional/feature_assumevalid.py

@@ -109,8 +109,8 @@ def run_test(self):
         coinbase_pubkey = coinbase_key.get_pubkey()
 
         # Create the first block with a coinbase output to our key
-        height = 1
-        block = create_block(self.tip, create_coinbase(height, coinbase_pubkey), self.block_time)
+        height = self.nodes[0].getblockcount() + 1
+        block = create_block(self.tip, create_coinbase(height, coinbase_pubkey), height, self.block_time)
         self.blocks.append(block)
         self.block_time += 1
         block.solve()
@@ -121,7 +121,7 @@ def run_test(self):
 
         # Bury the block 100 deep so the coinbase output is spendable
         for i in range(100):
-            block = create_block(self.tip, create_coinbase(height), self.block_time)
+            block = create_block(self.tip, create_coinbase(height), height, self.block_time)
             block.solve()
             self.blocks.append(block)
             self.tip = block.sha256
@@ -134,7 +134,7 @@ def run_test(self):
         tx.vout.append(CTxOut(49 * 100000000, CScript([OP_TRUE])))
         tx.calc_sha256()
 
-        block102 = create_block(self.tip, create_coinbase(height), self.block_time)
+        block102 = create_block(self.tip, create_coinbase(height), height, self.block_time)
         self.block_time += 1
         block102.vtx.extend([tx])
         block102.hashMerkleRoot = block102.calc_merkle_root()
@@ -147,7 +147,7 @@ def run_test(self):
 
         # Bury the assumed valid block 2100 deep
         for i in range(2100):
-            block = create_block(self.tip, create_coinbase(height), self.block_time)
+            block = create_block(self.tip, create_coinbase(height), height, self.block_time)
             block.nVersion = 4
             block.solve()
             self.blocks.append(block)