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

Merge pull request #87 from p2p-org/do-not-write-ws-exception-stacktrace

Browse Source 
do not call fillInStackTrace in exception constructor in happy path
This commit is contained in:
a10zn8
2022-12-19 16:14:31 +04:00
committed by GitHub
parent 6d7da4fdbe f59b878dc6
commit 5db9e1bfd1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/WsConnection.kt
View File

@@ -401,7 +401,8 @@ open class WsConnection(
JsonRpcError( JsonRpcError(
RpcResponseError.CODE_INTERNAL_ERROR, RpcResponseError.CODE_INTERNAL_ERROR,
"Response not received from WebSocket" "Response not received from WebSocket"
) ),
false
) )
val response = Flux.from(rpcReceive.asFlux()) val response = Flux.from(rpcReceive.asFlux())

5
src/main/kotlin/io/emeraldpay/dshackle/upstream/rpcclient/JsonRpcException.kt
View File

@@ -19,8 +19,9 @@ import io.emeraldpay.etherjar.rpc.RpcException
class JsonRpcException( class JsonRpcException(
val id: JsonRpcResponse.Id, val id: JsonRpcResponse.Id,
val error: JsonRpcError val error: JsonRpcError,
) : Exception(error.message) { writableStackTrace: Boolean = true
) : Exception(error.message, null, true, writableStackTrace) {
constructor(id: Int, message: String) : this(JsonRpcResponse.NumberId(id), JsonRpcError(-32005, message)) constructor(id: Int, message: String) : this(JsonRpcResponse.NumberId(id), JsonRpcError(-32005, message))

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

@@ -168,7 +168,7 @@ class NativeCallSpec extends Specification {
nativeCall.quorumReaderFactory = Mock(QuorumReaderFactory) { nativeCall.quorumReaderFactory = Mock(QuorumReaderFactory) {
1 * create(_, _, _) >> Mock(Reader) { 1 * create(_, _, _) >> Mock(Reader) {
1 * read(new JsonRpcRequest("eth_test", [], 10)) >> Mono.error( 1 * read(new JsonRpcRequest("eth_test", [], 10)) >> Mono.error(
new JsonRpcException(JsonRpcResponse.Id.from(12), new JsonRpcError(-32123, "Foo Bar", "Foo Bar Baz")) new JsonRpcException(JsonRpcResponse.Id.from(12), new JsonRpcError(-32123, "Foo Bar", "Foo Bar Baz"), true)
) )
} }
} }