fix: do not override service port

Signed-off-by: Ivan Ivanov <[email protected]>
hiero-ledger · Nov 28, 2024 · 8ab2853 · 8ab2853
1 parent dff3bef
commit 8ab2853
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/Endpoint.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/Endpoint.java
@@ -53,10 +53,6 @@ public Endpoint() {
     static Endpoint fromProtobuf(ServiceEndpoint serviceEndpoint) {
         var port = (int) (serviceEndpoint.getPort() & 0x00000000ffffffffL);
 
-        if (port == 0 || port == 50111) {
-            port = 50211;
-        }
-
         return new Endpoint()
             .setAddress(serviceEndpoint.getIpAddressV4().toByteArray())
             .setPort(port)

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeCreateTransactionTest.java
@@ -123,13 +123,23 @@ void fromScheduledTransaction() {
     }
 
     @Test
-    void testSerializeDeserialize() throws Exception {
-        var tx = new NodeCreateTransaction().setDescription(TEST_DESCRIPTION);
-        var tx2 = new NodeCreateTransaction().setDescription(TEST_DESCRIPTION);
-        var tx2Bytes = tx2.toBytes();
-        NodeCreateTransaction deserializedTx2 = (NodeCreateTransaction) Transaction.fromBytes(tx2Bytes);
-        assertThat(tx.getGossipCaCertificate()).isEqualTo(deserializedTx2.getGossipCaCertificate());
-        assertThat(tx.getGrpcCertificateHash()).isEqualTo(deserializedTx2.getGrpcCertificateHash());
+    void testUnrecognizedServicePort() throws Exception {
+        var tx = new NodeCreateTransaction()
+            .setServiceEndpoints(
+         List.of(new Endpoint()
+            .setAddress(new byte[] {0x00, 0x01, 0x02, 0x03})
+            .setDomainName("unit.test.com")
+            .setPort(50111)));
+        var tx2Bytes = tx.toBytes();
+        NodeCreateTransaction deserializedTx = (NodeCreateTransaction) Transaction.fromBytes(tx2Bytes);
+        assertThat(tx.getServiceEndpoints()).isEqualTo(deserializedTx.getServiceEndpoints());
+    }
+
+    @Test
+    void testNullOptionalValues() throws Exception {
+        var tx = new NodeCreateTransaction();
+        var tx2 = NodeCreateTransaction.fromBytes(tx.toBytes());
+        assertThat(tx2.toString()).isEqualTo(tx.toString());
     }
 
     @Test

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/NodeUpdateTransactionTest.java
@@ -120,11 +120,20 @@ void shouldBytes() throws Exception {
     @Test
     void testNullOptionalValues() throws Exception {
         var tx = new NodeUpdateTransaction();
-        var tx2Bytes = tx.toBytes();
-        NodeUpdateTransaction deserializedTx = (NodeUpdateTransaction) Transaction.fromBytes(tx2Bytes);
-        assertThat(deserializedTx.getGossipCaCertificate()).isNull();
-        assertThat(deserializedTx.getGrpcCertificateHash()).isNull();
-        assertThat(deserializedTx.getDescription()).isNull();
+        var tx2 = NodeUpdateTransaction.fromBytes(tx.toBytes());
+        assertThat(tx2.toString()).isEqualTo(tx.toString());
+    }
+
+    @Test
+    void testUnrecognizedServicePort() throws Exception {
+        var tx = new NodeUpdateTransaction()
+            .setServiceEndpoints(
+                List.of(new Endpoint()
+                    .setAddress(new byte[] {0x00, 0x01, 0x02, 0x03})
+                    .setDomainName("unit.test.com")
+                    .setPort(50111)));
+        var tx2 = NodeUpdateTransaction.fromBytes(tx.toBytes());
+        assertThat(tx2.toString()).isEqualTo(tx.toString());
     }
 
     @Test