Merge branch 'main' into 1650-addBytes4

hashgraph · Oct 13, 2024 · 1675a6a · 1675a6a
2 parents bd5d722 + 96e2f7b
commit 1675a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/SystemDeleteTransaction.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/SystemDeleteTransaction.java
@@ -103,6 +103,7 @@ public SystemDeleteTransaction setFileId(FileId fileId) {
         Objects.requireNonNull(fileId);
         requireNotFrozen();
         this.fileId = fileId;
+        this.contractId = null; // Reset contractId
         return this;
     }
 
@@ -128,6 +129,7 @@ public SystemDeleteTransaction setContractId(ContractId contractId) {
         Objects.requireNonNull(contractId);
         requireNotFrozen();
         this.contractId = contractId;
+        this.fileId = null; // Reset fileId
         return this;
     }
 

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/SystemDeleteTransactionTest.java
@@ -171,9 +171,7 @@ void getSetExpirationTimeFrozen() {
         assertThrows(IllegalStateException.class, () -> tx.setExpirationTime(validStart));
     }
 
-    // ported from C++ SDK, in Java it does not pass
     @Test
-    @Disabled
     void resetFileId() {
         var systemDeleteTransaction = new SystemDeleteTransaction();
         systemDeleteTransaction.setFileId(testFileId);
@@ -183,9 +181,7 @@ void resetFileId() {
         assertNotNull(systemDeleteTransaction.getContractId());
     }
 
-    // ported from C++ SDK, in Java it does not pass
     @Test
-    @Disabled
     void resetContractId() {
         var systemDeleteTransaction = new SystemDeleteTransaction();
         systemDeleteTransaction.setContractId(testContractId);