Fix rebase with state changes

Signed-off-by: Nana-EC <nana.essilfie-conduah@hedera.com>
hashgraph · Jan 26, 2022 · a183288 · a183288
1 parent 8ac35c6
commit a183288
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...ror/importer/parser/record/transactionhandler/AbstractContractCallTransactionHandler.java b/...ror/importer/parser/record/transactionhandler/AbstractContractCallTransactionHandler.java
@@ -110,7 +110,8 @@ protected final void onContractResult(RecordItem recordItem, ContractResult cont
                     contractStateChange.setSlot(DomainUtils.toBytes(storageChange.getSlot()));
                     contractStateChange.setValueRead(DomainUtils.toBytes(storageChange.getValueRead()));
 
-                    // If a value of zero is written the valueWritten will be present but the inner value will be absent.
+                    // If a value of zero is written the valueWritten will be present but the inner value will be
+                    // absent.
                     // If a value was read and not written this value will not be present.
                     if (storageChange.hasValueWritten()) {
                         contractStateChange
@@ -120,9 +121,10 @@ protected final void onContractResult(RecordItem recordItem, ContractResult cont
                     entityListener.onContractStateChange(contractStateChange);
                 }
             }
-
-            entityListener.onContractResult(contractResult);
         }
+
+        // always persist a contract result whether partial or complete
+        entityListener.onContractResult(contractResult);
     }
 
     protected abstract void doUpdateEntity(Contract contract, RecordItem recordItem);

diff --git a/...n/v1/V1.54.0__contract_result_partial.sql → ...n/v1/V1.54.1__contract_result_partial.sql b/...n/v1/V1.54.0__contract_result_partial.sql → ...n/v1/V1.54.1__contract_result_partial.sql
diff --git a/...com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java b/...com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java
@@ -589,7 +589,8 @@ private void assertContractCreateResult(ContractCreateTransactionBody transactio
                     .returns(EntityId.of(record.getReceipt().getContractID()), ContractResult::getContractId);
         }
 
-        assertContractResult(consensusTimestamp, result, result.getLogInfoList(), contractResult, result.getStateChangesList()
+        assertContractResult(consensusTimestamp, result, result.getLogInfoList(), contractResult,
+                result.getStateChangesList(),
                 status == ResponseCodeEnum.SUCCESS ? EntityId.of(result.getContractID()) : null);
     }