Merge commit '454af28e037506c194747a1f75fa5e51fe9983ff'

hashgraph · Feb 1, 2022 · 8f39013 · 8f39013
2 parents 4bbc89f + 454af28
commit 8f39013
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/sdk/src/main/java/com/hedera/hashgraph/sdk/Executable.java b/sdk/src/main/java/com/hedera/hashgraph/sdk/Executable.java
@@ -237,7 +237,7 @@ public O execute(Client client, Duration timeout) throws TimeoutException, Prech
                 if(grpcRequest.shouldRetryExceptionally(lastException)) {
                     continue;
                 } else {
-                    throw grpcRequest.mapStatusException();
+                    throw new RuntimeException(lastException);
                 }
             }
 

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.snap b/sdk/src/test/java/com/hedera/hashgraph/sdk/AccountInfoTest.snap
@@ -196,7 +196,7 @@ com.hedera.hashgraph.sdk.AccountInfoTest.toProtobuf=[
     "ownedNfts_": 0,
     "maxAutomaticTokenAssociations_": 0,
     "alias_": {
-      "hash": 0,
+      "hash": 1,
       "bytes": "",
       "validUtf8": true,
       "empty": true

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/ExecutableTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/ExecutableTest.java
@@ -350,7 +350,7 @@ void executeRetriableErrorDuringCall() {
                 throw new StatusRuntimeException(io.grpc.Status.ABORTED);
         };
 
-        assertThrows(PrecheckStatusException.class, () ->  tx.execute(client));
+        assertThrows(RuntimeException.class, () ->  tx.execute(client));
 
         verify(node3).channelFailedToConnect();
         verify(node4).channelFailedToConnect();

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/Mocker.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/Mocker.java
@@ -56,7 +56,9 @@ public class Mocker implements AutoCloseable {
                             var responseIndex = index.getAndIncrement();
 
                             if (responseIndex >= response.size()) {
+                                System.out.println("AAAAAAAAA");
                                 responseObserver.onError(Status.Code.ABORTED.toStatus().asRuntimeException());
+                                return;
                             }
 
                             var r = response.get(responseIndex);

diff --git a/sdk/src/test/java/com/hedera/hashgraph/sdk/MockingTest.java b/sdk/src/test/java/com/hedera/hashgraph/sdk/MockingTest.java
@@ -59,7 +59,7 @@ void exitOnAborted() throws PrecheckStatusException, TimeoutException, Interrupt
         var responses = List.of(responses1);
 
         try (var mocker = Mocker.withResponses(responses)) {
-            Assertions.assertThrows(StatusRuntimeException.class, () -> new AccountBalanceQuery().setAccountId(new AccountId(10)).execute(mocker.client));
+            Assertions.assertThrows(RuntimeException.class, () -> new AccountBalanceQuery().setAccountId(new AccountId(10)).execute(mocker.client));
         }
     }