[2.0.0-SNAPSHOT]

GoodforGod · GoodforGod · commit 2d666bcdc67a · 2023-05-15T00:57:16.000+03:00
Log simplified
Tests reinforced
diff --git a/src/main/java/io/goodforgod/api/etherscan/model/Log.java b/src/main/java/io/goodforgod/api/etherscan/model/Log.java
@@ -64,28 +64,26 @@ public Long getTransactionIndex() {
 
     public LocalDateTime getTimeStamp() {
         if (_timeStamp == null && !BasicUtils.isEmpty(timeStamp)) {
-            long formatted = (timeStamp.charAt(0) == '0' && timeStamp.charAt(1) == 'x')
-                    ? BasicUtils.parseHex(timeStamp).longValue()
-                    : Long.parseLong(timeStamp);
+            long formatted = getTimeStampAsSeconds();
             _timeStamp = LocalDateTime.ofEpochSecond(formatted, 0, ZoneOffset.UTC);
         }
         return _timeStamp;
     }
 
     /**
-     * Return the "timeStamp" field of the event record as a long-int representing the milliseconds
+     * Return the "timeStamp" field of the event record as a long-int representing the seconds
      * since the Unix epoch (1970-01-01 00:00:00).
      *
      * @return milliseconds between Unix epoch and `timeStamp`. If field is empty or null, returns null
      */
-    public Long getTimeStampAsMillis() {
+    public Long getTimeStampAsSeconds() {
         if (BasicUtils.isEmpty(timeStamp)) {
             return null;
         }
-        long tsSecs = (timeStamp.charAt(0) == '0' && timeStamp.charAt(1) == 'x')
+
+        return (timeStamp.charAt(0) == '0' && timeStamp.charAt(1) == 'x')
                 ? BasicUtils.parseHex(timeStamp).longValue()
                 : Long.parseLong(timeStamp);
-        return tsSecs * 1000;
     }
 
     public String getData() {
diff --git a/src/test/java/io/goodforgod/api/etherscan/model/ModelBuilderTests.java b/src/test/java/io/goodforgod/api/etherscan/model/ModelBuilderTests.java
@@ -168,6 +168,31 @@ void txBuilder() {
         assertTrue(value.haveError());
         assertEquals("1", value.getTo());
         assertEquals("1", value.getFrom());
+
+        Tx value2 = Tx.builder()
+                .withBlockHash("1")
+                .withBlockNumber(1L)
+                .withConfirmations(1L)
+                .withContractAddress("1")
+                .withFrom("1")
+                .withTo("1")
+                .withCumulativeGasUsed(Wei.ofWei(BigInteger.ONE))
+                .withGas(Wei.ofWei(BigInteger.ONE))
+                .withGasPrice(Wei.ofWei(BigInteger.ONE))
+                .withGasUsed(Wei.ofWei(BigInteger.ONE))
+                .withHash("1")
+                .withInput("1")
+                .withIsError("1")
+                .withNonce(1L)
+                .withTimeStamp(timestamp)
+                .withValue(BigInteger.ONE)
+                .withTransactionIndex(1)
+                .withTxReceiptStatus("1")
+                .build();
+
+        assertEquals(value, value2);
+        assertEquals(value.hashCode(), value2.hashCode());
+        assertEquals(value.toString(), value2.toString());
     }
 
     @Test
@@ -258,6 +283,32 @@ void txErc1155Builder() {
         assertNotNull(value);
         assertEquals("1", value.getTo());
         assertEquals("1", value.getFrom());
+
+        TxErc1155 value2 = TxErc1155.builder()
+                .withBlockHash("1")
+                .withBlockNumber(1L)
+                .withConfirmations(1L)
+                .withContractAddress("1")
+                .withFrom("1")
+                .withTo("1")
+                .withCumulativeGasUsed(Wei.ofWei(BigInteger.ONE))
+                .withGas(Wei.ofWei(BigInteger.ONE))
+                .withGasPrice(Wei.ofWei(BigInteger.ONE))
+                .withGasUsed(Wei.ofWei(BigInteger.ONE))
+                .withHash("1")
+                .withInput("1")
+                .withTokenName("1")
+                .withTokenSymbol("1")
+                .withTokenDecimal("1")
+                .withTokenID("1")
+                .withNonce(1L)
+                .withTimeStamp(timestamp)
+                .withTransactionIndex(1)
+                .build();
+
+        assertEquals(value, value2);
+        assertEquals(value.hashCode(), value2.hashCode());
+        assertEquals(value.toString(), value2.toString());
     }
 
     @Test
@@ -283,6 +334,27 @@ void txInternalBuilder() {
         assertNotNull(value);
         assertEquals("1", value.getTo());
         assertEquals("1", value.getFrom());
+
+        TxInternal value2 = TxInternal.builder()
+                .withBlockNumber(1L)
+                .withContractAddress("1")
+                .withFrom("1")
+                .withTo("1")
+                .withValue(BigInteger.ONE)
+                .withGas(Wei.ofWei(BigInteger.ONE))
+                .withGasUsed(Wei.ofWei(BigInteger.ONE))
+                .withHash("1")
+                .withInput("1")
+                .withTimeStamp(timestamp)
+                .withErrCode("1")
+                .withIsError(1)
+                .withTraceId("1")
+                .withType("1")
+                .build();
+
+        assertEquals(value, value2);
+        assertEquals(value.hashCode(), value2.hashCode());
+        assertEquals(value.toString(), value2.toString());
     }
 
     @Test
