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

solution: rename grpc target to method

Browse Source
This commit is contained in:
Igor Artamonov
2019-08-19 22:36:29 -04:00
parent 03ce6f74a5
commit a03325a619
8 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/io/emeraldpay/dshackle/rpc/Describe.kt
View File

@@ -3,8 +3,6 @@ package io.emeraldpay.dshackle.rpc
import io.emeraldpay.api.proto.BlockchainOuterClass
import io.emeraldpay.api.proto.Common
import io.emeraldpay.dshackle.upstream.*
import io.emeraldpay.grpc.Chain
import io.grpc.stub.StreamObserver
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service
import reactor.core.publisher.Mono
@@ -24,7 +22,7 @@ class Describe(
val targets = chainUpstreams.getSupportedTargets()
val chainDescription = BlockchainOuterClass.DescribeChain.newBuilder()
.setChain(Common.ChainRef.forNumber(chain.id))
.addAllSupportedTargets(targets)
.addAllSupportedMethods(targets)
.setStatus(status)
chainUpstreams.getAll().let { ups ->
ups.forEach { up ->

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

@@ -80,7 +80,7 @@ class NativeCall(
val matcher = Selector.convertToMatcher(request.selector)
val apis = upstream.getApis(matcher)
return request.itemsList.toFlux().map {
val method = it.target
val method = it.method
val params = it.payload.toStringUtf8()
val callQuorum = upstream.targets?.getQuorumFor(method) ?: AlwaysQuorum()
callQuorum.init(upstream.getHead())

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

@@ -89,8 +89,7 @@ class EthereumGrpcTransport(
val params = objectMapper.writeValueAsBytes(call.params)
val nativeCallItem = BlockchainOuterClass.NativeCallItem.newBuilder()
.setId(id)
.setMethod("POST")
.setTarget(call.method)
.setMethod(call.method)
.setPayload(ByteString.copyFrom(params))
.build()
req.addItems(nativeCallItem)

2
src/main/kotlin/io/emeraldpay/dshackle/upstream/GrpcUpstream.kt
View File

@@ -112,7 +112,7 @@ open class GrpcUpstream(
}
fun init(conf: BlockchainOuterClass.DescribeChain) {
supportedMethods.addAll(conf.supportedTargetsList)
supportedMethods.addAll(conf.supportedMethodsList)
val nodes = NodeDetailsList()
conf.nodesList.forEach { node ->
val node = NodeDetailsList.NodeDetails(node.quorum,

1
src/main/kotlin/io/emeraldpay/dshackle/upstream/UpstreamValidator.kt
View File

@@ -26,7 +26,6 @@ class UpstreamValidator(
}
return UpstreamAvailability.OK
} catch (e: Throwable) {
e.printStackTrace()
return UpstreamAvailability.UNAVAILABLE
}
}

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

@@ -155,7 +155,7 @@ class NativeCallSpec extends Specification {
.addAllItems([1, 2].collect { id ->
return BlockchainOuterClass.NativeCallItem.newBuilder()
.setId(id)
.setTarget("eth_test")
.setMethod("eth_test")
.build()
})
.build()
@@ -178,7 +178,7 @@ class NativeCallSpec extends Specification {
.addAllItems([1, 2].collect { id ->
return BlockchainOuterClass.NativeCallItem.newBuilder()
.setId(id)
.setTarget("eth_test")
.setMethod("eth_test")
.build()
})
.build()

2
src/test/groovy/io/emeraldpay/dshackle/test/EthereumApiMock.groovy
View File

@@ -54,7 +54,7 @@ class EthereumApiMock extends EthereumApi {
def nativeCall(BlockchainOuterClass.NativeCallRequest request, StreamObserver<BlockchainOuterClass.NativeCallReplyItem> responseObserver) {
request.itemsList.forEach { req ->
def resp = execute(req.id, req.target, objectMapper.readerFor(List).readValue(req.payload.toByteArray()))
def resp = execute(req.id, req.method, objectMapper.readerFor(List).readValue(req.payload.toByteArray()))
resp.subscribe {
def proto = BlockchainOuterClass.NativeCallReplyItem.newBuilder()
.setId(req.id)

6
src/test/groovy/io/emeraldpay/dshackle/upstream/EthereumGrpcTransportSpec.groovy
View File

@@ -58,7 +58,7 @@ class EthereumGrpcTransportSpec extends Specification {
chain.number == Chain.ETHEREUM.id
itemsCount == 1
with(getItems(0)) {
target == "eth_test"
method == "eth_test"
payload.toStringUtf8() == "[1]"
}
}
@@ -106,11 +106,11 @@ class EthereumGrpcTransportSpec extends Specification {
chain.number == Chain.ETHEREUM.id
itemsCount == 2
with(getItems(0)) {
target == "eth_test"
method == "eth_test"
payload.toStringUtf8() == "[1]"
}
with(getItems(1)) {
target == "eth_test2"
method == "eth_test2"
payload.toStringUtf8() == "[2,\"3\"]"
}
}