[Tests] get correct nStakeModifier

random-zebra · random-zebra · commit d783229568f4 · 2019-02-14T01:04:59.000+01:00
diff --git a/test/functional/fake_stake/base_test.py b/test/functional/fake_stake/base_test.py
@@ -107,8 +107,7 @@ def create_spam_block(self, hashPrevBlock, stakingPrevOuts, height, fStakeDouble
 
         # create a new private key used for block signing.
         # solve for the block here
-        parent_block_stake_modifier = int(self.node.getblock(hashPrevBlock)['modifier'], 16)
-        if not block.solve_stake(parent_block_stake_modifier, stakingPrevOuts):
+        if not block.solve_stake(stakingPrevOuts):
             raise Exception("Not able to solve for any prev_outpoint")
 
         self.log.info("Stake found. Signing block...")
@@ -267,8 +266,11 @@ def get_prevouts(self, utxo_list):
         '''
         stakingPrevOuts = {}
         for utxo in utxo_list:
-            txBlocktime = self.node.getrawtransaction(utxo['txid'], 1)['blocktime']
-            utxo_to_stakingPrevOuts(utxo, stakingPrevOuts, txBlocktime)
+            utxo_tx = self.node.getrawtransaction(utxo['txid'], 1)
+            txBlocktime = utxo_tx['blocktime']
+            txBlockhash = utxo_tx['blockhash']
+            stakeModifier = int(self.node.getblock(txBlockhash)['modifier'], 16)
+            utxo_to_stakingPrevOuts(utxo, stakingPrevOuts, txBlocktime, stakeModifier)
 
         return stakingPrevOuts
 
diff --git a/test/functional/fake_stake/util.py b/test/functional/fake_stake/util.py
@@ -114,7 +114,7 @@ def create_transaction(outPoint, sig, value, nTime, scriptPubKey=CScript()):
     return tx
 
 
-def utxo_to_stakingPrevOuts(utxo, stakingPrevOuts, txBlocktime):
+def utxo_to_stakingPrevOuts(utxo, stakingPrevOuts, txBlocktime, stakeModifier):
     '''
     Updates a map of unspent outputs to (amount, blocktime) to be used as stake inputs
     :param   utxo:              (map) utxo JSON object returned from listunspent
@@ -126,7 +126,7 @@ def utxo_to_stakingPrevOuts(utxo, stakingPrevOuts, txBlocktime):
     COINBASE_MATURITY = 100
     if utxo['confirmations'] > COINBASE_MATURITY:
         outPoint = COutPoint(int(utxo['txid'], 16), utxo['vout'])
-        stakingPrevOuts[outPoint] = (int(utxo['amount'])*COIN, txBlocktime)
+        stakingPrevOuts[outPoint] = (int(utxo['amount'])*COIN, txBlocktime, stakeModifier)
 
     return
 
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
@@ -468,12 +468,12 @@ def get_uniqueness(self, prevout):
         r += ser_uint256(prevout.hash)
         return r
 
-    def solve_stake(self, stakeModifier, prevouts):
+    def solve_stake(self, prevouts):
         target0 = uint256_from_compact(self.nBits)
         loop = True
         while loop:
             for prevout in prevouts:
-                nvalue, txBlockTime = prevouts[prevout]
+                nvalue, txBlockTime, stakeModifier = prevouts[prevout]
                 target = int(target0 * nvalue / 100) % 2**256
                 data = b""
                 data += ser_uint64(stakeModifier)
