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

Merge pull request #76 from p2p-org/more-debug-2

Browse Source 
trying to find null in response - log null string value
This commit is contained in:
a10zn8
2022-12-09 19:35:35 +04:00
committed by GitHub
parent 66e7f76903 421abc20da
commit c41d8c85ba
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,8 @@ open class NativeCall(
private val log = LoggerFactory.getLogger(NativeCall::class.java) private val log = LoggerFactory.getLogger(NativeCall::class.java)
private val objectMapper: ObjectMapper = Global.objectMapper private val objectMapper: ObjectMapper = Global.objectMapper
private val nullValue: ByteArray = "null".toByteArray()
var quorumReaderFactory: QuorumReaderFactory = QuorumReaderFactory.default() var quorumReaderFactory: QuorumReaderFactory = QuorumReaderFactory.default()
private val ethereumCallSelectors = EnumMap<Chain, EthereumCallSelector>(Chain::class.java) private val ethereumCallSelectors = EnumMap<Chain, EthereumCallSelector>(Chain::class.java)
@@ -119,7 +121,7 @@ open class NativeCall(
result.setErrorMessage(error.message).setErrorCode(error.id) result.setErrorMessage(error.message).setErrorCode(error.id)
} }
} else { } else {
if (it.result == null || it.result.isEmpty()) { if (it.result == null || it.result.isEmpty() || nullValue.contentEquals(it.result)) {
log.warn("Empty result [${it.result}] on building response, method ${it.ctx?.payload?.method}, params ${it.ctx?.payload?.params}") log.warn("Empty result [${it.result}] on building response, method ${it.ctx?.payload?.method}, params ${it.ctx?.payload?.params}")
} }
result.payload = ByteString.copyFrom(it.result) result.payload = ByteString.copyFrom(it.result)
@@ -340,7 +342,7 @@ open class NativeCall(
} }
private fun validateResult(bytes: ByteArray, origin: String, ctx: ValidCallContext<ParsedCallDetails>) { private fun validateResult(bytes: ByteArray, origin: String, ctx: ValidCallContext<ParsedCallDetails>) {
if (bytes.isEmpty()) if (bytes.isEmpty() || nullValue.contentEquals(bytes))
log.warn("Empty result from origin $origin, method ${ctx.payload.method}, params ${ctx.payload.params}") log.warn("Empty result from origin $origin, method ${ctx.payload.method}, params ${ctx.payload.params}")
} }