From 3451837e2ac1375afade463348cab54376f95107 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Thu, 6 Oct 2022 15:04:34 +0300 Subject: [PATCH 1/6] submodules updated --- emerald-java-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emerald-java-client b/emerald-java-client index 521524b6..a42a17dc 160000 --- a/emerald-java-client +++ b/emerald-java-client @@ -1 +1 @@ -Subproject commit 521524b657a9a55dd8fa86950f14aeeac1a0eff8 +Subproject commit a42a17dc10a94c44c6d13574f02698d673d0cb1e From d2f4934c9f8fe58493920102d3eb4db39c220760 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Thu, 6 Oct 2022 15:07:31 +0300 Subject: [PATCH 2/6] submodules updated --- emerald-java-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emerald-java-client b/emerald-java-client index a42a17dc..caecf1cb 160000 --- a/emerald-java-client +++ b/emerald-java-client @@ -1 +1 @@ -Subproject commit a42a17dc10a94c44c6d13574f02698d673d0cb1e +Subproject commit caecf1cb83e55ba7ecf6515e6a1ca2b975c0f1f8 From 44ffc56793065bbff9600ccf5cc912e1b483b190 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Thu, 6 Oct 2022 15:45:03 +0300 Subject: [PATCH 3/6] submodules updated --- emerald-java-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emerald-java-client b/emerald-java-client index caecf1cb..d7625661 160000 --- a/emerald-java-client +++ b/emerald-java-client @@ -1 +1 @@ -Subproject commit caecf1cb83e55ba7ecf6515e6a1ca2b975c0f1f8 +Subproject commit d7625661a4414c758fc7338c934b36747eec6776 From 7b8365aa11f00befab530bed70158defec5ffb83 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Thu, 6 Oct 2022 15:59:28 +0300 Subject: [PATCH 4/6] update refs --- dshackle-cli/grpc | 2 +- emerald-java-client | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dshackle-cli/grpc b/dshackle-cli/grpc index d21e88f5..4ed721cb 160000 --- a/dshackle-cli/grpc +++ b/dshackle-cli/grpc @@ -1 +1 @@ -Subproject commit d21e88f56f5a31fb5619cf9cf36c8649fa998535 +Subproject commit 4ed721cb908a782e4d99c49979087f29b7e5d54a diff --git a/emerald-java-client b/emerald-java-client index d7625661..39765fd0 160000 --- a/emerald-java-client +++ b/emerald-java-client @@ -1 +1 @@ -Subproject commit d7625661a4414c758fc7338c934b36747eec6776 +Subproject commit 39765fd040f6cb417ad7e4fe7c05b508a2e6ee1a From 745cb3668fb0435fd48d5856c9a4a1ebb621a725 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Thu, 6 Oct 2022 16:30:40 +0300 Subject: [PATCH 5/6] added error code --- src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt index d492db9c..024030a8 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt @@ -112,7 +112,7 @@ open class NativeCall( .setId(it.id) if (it.isError()) { it.error?.let { error -> - result.setErrorMessage(error.message) + result.setErrorMessage(error.message).setErrorCode(error.id) } } else { result.payload = ByteString.copyFrom(it.result) @@ -145,6 +145,7 @@ open class NativeCall( return BlockchainOuterClass.NativeCallReplyItem.newBuilder() .setSucceed(false) .setErrorMessage(it?.message ?: "Internal error") + .setErrorCode(500) .setId(id) .build() .toMono() From b133210780267993618eb05da40f9c4887417ae7 Mon Sep 17 00:00:00 2001 From: Maxksim Fomenkov Date: Fri, 7 Oct 2022 10:18:34 +0300 Subject: [PATCH 6/6] fix tests --- .../groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy b/src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy index 1d27097a..8a7c9e1d 100644 --- a/src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy +++ b/src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy @@ -167,6 +167,7 @@ class NativeCallSpec extends Specification { .setSucceed(false) .setErrorMessage("Failed to call 5: test test") .setId(5) + .setErrorCode(500) .build()) .expectComplete() .verify(Duration.ofSeconds(1)) @@ -182,6 +183,7 @@ class NativeCallSpec extends Specification { .expectNext(BlockchainOuterClass.NativeCallReplyItem.newBuilder() .setSucceed(false) .setErrorMessage("test test") + .setErrorCode(500) .build()) .expectComplete() .verify(Duration.ofSeconds(1))