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

Remove error correction, use new errorCode (#347)

Browse Source
This commit is contained in:
KirillPamPam
2023-11-22 15:27:28 +04:00
committed by GitHub
parent 09c6b231b7
commit a7f74bb71a
5 changed files with 6 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ class NativeCallSpec extends Specification {
config.cache = cacheConfig
config.passthrough = passthrough
new NativeCall(upstreams, signer, config, Stub(Tracer), Stub(ErrorCorrector))
new NativeCall(upstreams, signer, config, Stub(Tracer))
}
def "Tries router first"() {

93
src/test/kotlin/io/emeraldpay/dshackle/rpc/ErrorProcessingTest.kt
View File

@@ -1,93 +0,0 @@
package io.emeraldpay.dshackle.rpc
import io.emeraldpay.dshackle.quorum.CallQuorum
import io.emeraldpay.dshackle.upstream.Multistream
import io.emeraldpay.dshackle.upstream.Selector
import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcError
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.mockito.kotlin.mock
class ErrorProcessingTest {
@Test
fun `fix nethermind eth_call reverted error`() {
val result = result("eth_call", "Reverted 0x0111")
val error = result.error!!
val corrector = ErrorCorrector(listOf(NethermindEthCallRevertedErrorProcessor()))
val fixedError = corrector.correctError(result)
assertEquals(
NativeCall.CallError(3, error.message, error.upstreamError, "0x0111", error.upstreamId),
fixedError,
)
}
@Test
fun `return the same error if there is no suitable processor`() {
val result = result("eth_getBlockByNumber", "Reverted 0x0111")
val error = result.error!!
val corrector = ErrorCorrector(listOf(NethermindEthCallRevertedErrorProcessor()))
val fixedError = corrector.correctError(result)
assertEquals(
NativeCall.CallError(55, error.message, error.upstreamError, "Reverted 0x0111", error.upstreamId),
fixedError,
)
}
@Test
fun `throw an exception if there is no error in result`() {
val result = NativeCall.CallResult(
1,
2,
null,
null,
null,
null,
)
assertThrows<IllegalStateException>("No error to correct") {
val corrector = ErrorCorrector(listOf(NethermindEthCallRevertedErrorProcessor()))
corrector.correctError(result)
}
}
@Test
fun `NethermindEthCallRevertedErrorProcessor returns false if result is with null data`() {
val processor = NethermindEthCallRevertedErrorProcessor()
val result = result("eth_call", null)
val matched = processor.matches(result)
assertFalse(matched)
}
private fun result(method: String, errorData: String?): NativeCall.CallResult =
NativeCall.CallResult(
1,
2,
null,
NativeCall.CallError(
55,
"reverted",
JsonRpcError(1, "errMessage", null),
errorData,
"upId",
),
null,
NativeCall.ValidCallContext(
1,
2,
mock<Multistream>(),
Selector.empty,
mock<CallQuorum>(),
NativeCall.ParsedCallDetails(method, emptyList()),
"req",
1,
),
)
}