Merge #7468: [rpc-tests] Change solve() to use rehash

7689041 [rpc-tests] Change solve() to use rehash (mrbandrews)

qa/rpc-tests/test_framework/mininode.py

@@ -536,7 +536,7 @@ class CBlock(CBlockHeader):
         return True
 
     def solve(self):
-        self.calc_sha256()
+        self.rehash()
         target = uint256_from_compact(self.nBits)
         while self.sha256 > target:
             self.nNonce += 1