Merge pull request #2343 from AntelopeIO/GH-2310-test

IF: Test: trx_finality_status_forked_test

tests/trx_finality_status_forked_test.py

@@ -116,17 +116,25 @@
     def getState(status):
         assert status is not None, "ERROR: getTransactionStatus failed to return any status"
         assert "state" in status, \
-            f"ERROR: getTransactionStatus returned a status object that didn't have a \"state\" field. state: {json.dumps(status, indent=1)}"
+            f"ERROR: getTransactionStatus returned a status object that didn't have a \"state\" field. status: {json.dumps(status, indent=1)}"
         return status["state"]
 
     def getBlockNum(status):
         assert status is not None, "ERROR: getTransactionStatus failed to return any status"
-        assert "head_number" in status, \
-            f"ERROR: getTransactionStatus returned a status object that didn't have a \"head_number\" field. state: {json.dumps(status, indent=1)}"
         if "block_number" in status:
             return status["block_number"]
+        assert "head_number" in status, \
+            f"ERROR: getTransactionStatus returned a status object that didn't have a \"head_number\" field. status: {json.dumps(status, indent=1)}"
         return status["head_number"]
 
+    def getBlockID(status):
+        assert status is not None, "ERROR: getTransactionStatus failed to return any status"
+        if "block_id" in status:
+            return status["block_id"]
+        assert "head_id" in status, \
+            f"ERROR: getTransactionStatus returned a status object that didn't have a \"head_id\" field. status: {json.dumps(status, indent=1)}"
+        return status["head_id"]
+
     transferAmount = 10
     # Does not use transaction retry (not needed)
     transfer = prodD.transferFunds(cluster.eosioAccount, cluster.defproduceraAccount, f"{transferAmount}.0000 {CORE_SYMBOL}", "fund account")
@@ -210,18 +218,18 @@ def getBlockNum(status):
         f"\n\nprod A info: {json.dumps(prodA.getInfo(), indent=1)}\n\nprod D info: {json.dumps(prodD.getInfo(), indent=1)}"
 
     afterForkInBlockState = retStatus
-    afterForkBlockId = retStatus["block_id"]
-    assert afterForkInBlockState["block_number"] > originalInBlockState["block_number"], \
+    afterForkBlockId = getBlockID(retStatus)
+    assert getBlockNum(afterForkInBlockState) > getBlockNum(originalInBlockState), \
         "ERROR: The way the test is designed, the transaction should be added to a block that has a higher number than it was in originally before it was forked out." + \
        f"\n\noriginal in block state: {json.dumps(originalInBlockState, indent=1)}\n\nafter fork in block state: {json.dumps(afterForkInBlockState, indent=1)}"
 
-    assert prodD.waitForBlock(afterForkInBlockState["block_number"], timeout=120, blockType=BlockType.lib), \
+    assert prodD.waitForBlock(getBlockNum(afterForkInBlockState), timeout=120, blockType=BlockType.lib), \
         f"ERROR: Block never finalized.\n\nprod A info: {json.dumps(prodA.getInfo(), indent=1)}\n\nprod C info: {json.dumps(prodD.getInfo(), indent=1)}" + \
         f"\n\nafter fork in block state: {json.dumps(afterForkInBlockState, indent=1)}"
 
     retStatus = prodD.getTransactionStatus(transId)
-    if afterForkBlockId != retStatus["block_id"]: # might have been forked out, if so wait for new block to become LIB
-        assert prodD.waitForBlock(retStatus["block_number"], timeout=120, blockType=BlockType.lib), \
+    if afterForkBlockId != getBlockID(retStatus): # might have been forked out, if so wait for new block to become LIB
+        assert prodD.waitForBlock(getBlockNum(retStatus), timeout=120, blockType=BlockType.lib), \
             f"ERROR: Block never finalized.\n\nprod A info: {json.dumps(prodA.getInfo(), indent=1)}\n\nprod C info: {json.dumps(prodD.getInfo(), indent=1)}" + \
             f"\n\nafter fork in block state: {json.dumps(afterForkInBlockState, indent=1)}"