StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from p2p-org/pass_error_code_to_grpc_reply

Browse Source 
Pass error code to grpc reply
This commit is contained in:
Vyacheslav Shebanov
2022-10-07 11:29:35 +03:00
committed by GitHub
parent d8efbcff47 b133210780
commit 47a36f7831
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dshackle-cli/grpc

Submodule dshackle-cli/grpc updated: d21e88f56f...4ed721cb90

2
emerald-java-client

Submodule emerald-java-client updated: 521524b657...39765fd040

3
src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt
View File

@@ -112,7 +112,7 @@ open class NativeCall(
.setId(it.id) .setId(it.id)
if (it.isError()) { if (it.isError()) {
it.error?.let { error -> it.error?.let { error ->
result.setErrorMessage(error.message) result.setErrorMessage(error.message).setErrorCode(error.id)
} }
} else { } else {
result.payload = ByteString.copyFrom(it.result) result.payload = ByteString.copyFrom(it.result)
@@ -145,6 +145,7 @@ open class NativeCall(
return BlockchainOuterClass.NativeCallReplyItem.newBuilder() return BlockchainOuterClass.NativeCallReplyItem.newBuilder()
.setSucceed(false) .setSucceed(false)
.setErrorMessage(it?.message ?: "Internal error") .setErrorMessage(it?.message ?: "Internal error")
.setErrorCode(500)
.setId(id) .setId(id)
.build() .build()
.toMono() .toMono()

2
src/test/groovy/io/emeraldpay/dshackle/rpc/NativeCallSpec.groovy
View File

@@ -167,6 +167,7 @@ class NativeCallSpec extends Specification {
.setSucceed(false) .setSucceed(false)
.setErrorMessage("Failed to call 5: test test") .setErrorMessage("Failed to call 5: test test")
.setId(5) .setId(5)
.setErrorCode(500)
.build()) .build())
.expectComplete() .expectComplete()
.verify(Duration.ofSeconds(1)) .verify(Duration.ofSeconds(1))
@@ -182,6 +183,7 @@ class NativeCallSpec extends Specification {
.expectNext(BlockchainOuterClass.NativeCallReplyItem.newBuilder() .expectNext(BlockchainOuterClass.NativeCallReplyItem.newBuilder()
.setSucceed(false) .setSucceed(false)
.setErrorMessage("test test") .setErrorMessage("test test")
.setErrorCode(500)
.build()) .build())
.expectComplete() .expectComplete()
.verify(Duration.ofSeconds(1)) .verify(Duration.ofSeconds(1))