fix linter problemts
This commit is contained in:
@@ -18,7 +18,6 @@ package io.emeraldpay.dshackle.monitoring.accesslog
|
|||||||
import com.fasterxml.jackson.annotation.JsonInclude
|
import com.fasterxml.jackson.annotation.JsonInclude
|
||||||
import io.emeraldpay.grpc.Chain
|
import io.emeraldpay.grpc.Chain
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
import java.time.Duration
|
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
|
|
||||||
|
|||||||
@@ -236,7 +236,10 @@ class EventsBuilder {
|
|||||||
|
|
||||||
override fun onReply(msg: BlockchainOuterClass.ChainHead): Events.SubscribeHead {
|
override fun onReply(msg: BlockchainOuterClass.ChainHead): Events.SubscribeHead {
|
||||||
return Events.SubscribeHead(
|
return Events.SubscribeHead(
|
||||||
chain, UUID.randomUUID(), requestDetails, index++
|
chain,
|
||||||
|
UUID.randomUUID(),
|
||||||
|
requestDetails,
|
||||||
|
index++
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +269,13 @@ class EventsBuilder {
|
|||||||
val addressBalance = Events.AddressBalance(msg.asset.code, msg.address.address)
|
val addressBalance = Events.AddressBalance(msg.asset.code, msg.address.address)
|
||||||
val chain = Chain.byId(msg.asset.chain.number)
|
val chain = Chain.byId(msg.asset.chain.number)
|
||||||
return Events.SubscribeBalance(
|
return Events.SubscribeBalance(
|
||||||
chain, UUID.randomUUID(), subscribe, requestDetails, balanceRequest!!, addressBalance, index++
|
chain,
|
||||||
|
UUID.randomUUID(),
|
||||||
|
subscribe,
|
||||||
|
requestDetails,
|
||||||
|
balanceRequest!!,
|
||||||
|
addressBalance,
|
||||||
|
index++
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -284,7 +293,10 @@ class EventsBuilder {
|
|||||||
|
|
||||||
override fun onReply(msg: BlockchainOuterClass.TxStatus): Events.TxStatus {
|
override fun onReply(msg: BlockchainOuterClass.TxStatus): Events.TxStatus {
|
||||||
return Events.TxStatus(
|
return Events.TxStatus(
|
||||||
chain, UUID.randomUUID(), requestDetails, txStatusRequest!!,
|
chain,
|
||||||
|
UUID.randomUUID(),
|
||||||
|
requestDetails,
|
||||||
|
txStatusRequest!!,
|
||||||
Events.TxStatusResponse(msg.confirmations),
|
Events.TxStatusResponse(msg.confirmations),
|
||||||
index++
|
index++
|
||||||
)
|
)
|
||||||
@@ -295,7 +307,7 @@ class EventsBuilder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class NativeCall(private val startTs : Instant) :
|
class NativeCall(private val startTs: Instant) :
|
||||||
Base<NativeCall>(),
|
Base<NativeCall>(),
|
||||||
RequestReply<Events.NativeCall, BlockchainOuterClass.NativeCallRequest, BlockchainOuterClass.NativeCallReplyItem> {
|
RequestReply<Events.NativeCall, BlockchainOuterClass.NativeCallRequest, BlockchainOuterClass.NativeCallReplyItem> {
|
||||||
val items = ArrayList<Events.NativeCallItemDetails>()
|
val items = ArrayList<Events.NativeCallItemDetails>()
|
||||||
@@ -399,14 +411,14 @@ class EventsBuilder {
|
|||||||
payloadSizeBytes = msg.payload?.size()?.toLong() ?: 0L,
|
payloadSizeBytes = msg.payload?.size()?.toLong() ?: 0L,
|
||||||
id = UUID.randomUUID(),
|
id = UUID.randomUUID(),
|
||||||
channel = Events.Channel.GRPC,
|
channel = Events.Channel.GRPC,
|
||||||
responseBody = if (accessLogConfig.includeMessages) (msg.payload?.toStringUtf8() ?: "") else null,
|
responseBody = if (accessLogConfig.includeMessages) (msg.payload?.toStringUtf8() ?: "") else null
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class NativeSubscribeHttp(
|
class NativeSubscribeHttp(
|
||||||
val channel: Events.Channel,
|
val channel: Events.Channel,
|
||||||
chain: Chain,
|
chain: Chain
|
||||||
) :
|
) :
|
||||||
Base<NativeSubscribeHttp>(),
|
Base<NativeSubscribeHttp>(),
|
||||||
RequestReply<Events.NativeSubscribe, Pair<String, ByteArray?>, Long> {
|
RequestReply<Events.NativeSubscribe, Pair<String, ByteArray?>, Long> {
|
||||||
|
|||||||
@@ -24,7 +24,10 @@ import io.emeraldpay.dshackle.upstream.bitcoin.BitcoinUpstream
|
|||||||
import io.emeraldpay.dshackle.upstream.calls.CallMethods
|
import io.emeraldpay.dshackle.upstream.calls.CallMethods
|
||||||
import io.emeraldpay.dshackle.upstream.calls.DefaultBitcoinMethods
|
import io.emeraldpay.dshackle.upstream.calls.DefaultBitcoinMethods
|
||||||
import io.emeraldpay.dshackle.upstream.calls.DefaultEthereumMethods
|
import io.emeraldpay.dshackle.upstream.calls.DefaultEthereumMethods
|
||||||
import io.emeraldpay.dshackle.upstream.ethereum.*
|
import io.emeraldpay.dshackle.upstream.ethereum.EthereumMultistream
|
||||||
|
import io.emeraldpay.dshackle.upstream.ethereum.EthereumPosMultistream
|
||||||
|
import io.emeraldpay.dshackle.upstream.ethereum.EthereumPosUpstream
|
||||||
|
import io.emeraldpay.dshackle.upstream.ethereum.EthereumUpstream
|
||||||
import io.emeraldpay.grpc.BlockchainType
|
import io.emeraldpay.grpc.BlockchainType
|
||||||
import io.emeraldpay.grpc.Chain
|
import io.emeraldpay.grpc.Chain
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
|
|||||||
@@ -26,9 +26,8 @@ import io.emeraldpay.dshackle.upstream.Multistream
|
|||||||
import io.emeraldpay.dshackle.upstream.RequestPostprocessor
|
import io.emeraldpay.dshackle.upstream.RequestPostprocessor
|
||||||
import io.emeraldpay.dshackle.upstream.Selector
|
import io.emeraldpay.dshackle.upstream.Selector
|
||||||
import io.emeraldpay.dshackle.upstream.Upstream
|
import io.emeraldpay.dshackle.upstream.Upstream
|
||||||
import io.emeraldpay.dshackle.upstream.bitcoin.LocalCallRouter
|
|
||||||
import io.emeraldpay.dshackle.upstream.forkchoice.MostWorkForkChoice
|
|
||||||
import io.emeraldpay.dshackle.upstream.calls.DefaultBitcoinMethods
|
import io.emeraldpay.dshackle.upstream.calls.DefaultBitcoinMethods
|
||||||
|
import io.emeraldpay.dshackle.upstream.forkchoice.MostWorkForkChoice
|
||||||
import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest
|
import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest
|
||||||
import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcResponse
|
import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcResponse
|
||||||
import io.emeraldpay.grpc.Chain
|
import io.emeraldpay.grpc.Chain
|
||||||
@@ -93,8 +92,8 @@ open class BitcoinMultistream(
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
val newHead = MergedHead(sourceUpstreams.map { it.getHead() }, MostWorkForkChoice()).apply {
|
val newHead = MergedHead(sourceUpstreams.map { it.getHead() }, MostWorkForkChoice()).apply {
|
||||||
this.start()
|
this.start()
|
||||||
}
|
}
|
||||||
val lagObserver = BitcoinHeadLagObserver(newHead, sourceUpstreams)
|
val lagObserver = BitcoinHeadLagObserver(newHead, sourceUpstreams)
|
||||||
this.lagObserver = lagObserver
|
this.lagObserver = lagObserver
|
||||||
lagObserver.start()
|
lagObserver.start()
|
||||||
|
|||||||
Reference in New Issue
Block a user