Skip to content

Commit 58aa3b6

Browse files
committed
feat(jsonrpc): add blockTimestamp in hashCode() and equals()
1 parent 797fa3b commit 58aa3b6

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpc.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,12 +504,16 @@ public boolean equals(Object o) {
504504
if (!Objects.equals(logIndex, item.logIndex)) {
505505
return false;
506506
}
507-
return removed == item.removed;
507+
if (removed != item.removed) {
508+
return false;
509+
}
510+
return Objects.equals(blockTimestamp, item.blockTimestamp);
508511
}
509512

510513
@Override
511514
public int hashCode() {
512-
return Objects.hash(blockHash, transactionHash, transactionIndex, logIndex, removed);
515+
return Objects.hash(blockHash, transactionHash, transactionIndex,
516+
logIndex, removed, blockTimestamp);
513517
}
514518

515519
}

framework/src/test/java/org/tron/core/jsonrpc/LogMatchExactlyTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ public void testMatchBlock() {
232232
LogFilterElement logFilterElement2 = elementList2.get(0);
233233

234234
Assert.assertEquals("0x3e8", logFilterElement1.getBlockTimestamp());
235+
Assert.assertEquals("0x3e8", logFilterElement2.getBlockTimestamp());
235236
Assert.assertEquals(logFilterElement1.hashCode(), logFilterElement2.hashCode());
236237
Assert.assertEquals(logFilterElement1, logFilterElement2);
237238

0 commit comments

Comments
 (0)