From b6d853d771feb6340ccfb4c60b3edc19da42c815 Mon Sep 17 00:00:00 2001 From: terminal Date: Thu, 18 Aug 2022 20:47:33 +0400 Subject: [PATCH] fix linter problemts --- .../dshackle/monitoring/accesslog/Events.kt | 1 - .../monitoring/accesslog/EventsBuilder.kt | 24 ++++++++++++++----- .../upstream/CurrentMultistreamHolder.kt | 5 +++- .../upstream/bitcoin/BitcoinMultistream.kt | 7 +++--- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/Events.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/Events.kt index 5542c40e..c08aabc5 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/Events.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/Events.kt @@ -18,7 +18,6 @@ package io.emeraldpay.dshackle.monitoring.accesslog import com.fasterxml.jackson.annotation.JsonInclude import io.emeraldpay.grpc.Chain import org.slf4j.LoggerFactory -import java.time.Duration import java.time.Instant import java.util.UUID diff --git a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/EventsBuilder.kt b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/EventsBuilder.kt index f65918db..9b588d40 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/EventsBuilder.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/monitoring/accesslog/EventsBuilder.kt @@ -236,7 +236,10 @@ class EventsBuilder { override fun onReply(msg: BlockchainOuterClass.ChainHead): 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 chain = Chain.byId(msg.asset.chain.number) 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 { return Events.TxStatus( - chain, UUID.randomUUID(), requestDetails, txStatusRequest!!, + chain, + UUID.randomUUID(), + requestDetails, + txStatusRequest!!, Events.TxStatusResponse(msg.confirmations), index++ ) @@ -295,7 +307,7 @@ class EventsBuilder { } } - class NativeCall(private val startTs : Instant) : + class NativeCall(private val startTs: Instant) : Base(), RequestReply { val items = ArrayList() @@ -399,14 +411,14 @@ class EventsBuilder { payloadSizeBytes = msg.payload?.size()?.toLong() ?: 0L, id = UUID.randomUUID(), channel = Events.Channel.GRPC, - responseBody = if (accessLogConfig.includeMessages) (msg.payload?.toStringUtf8() ?: "") else null, + responseBody = if (accessLogConfig.includeMessages) (msg.payload?.toStringUtf8() ?: "") else null ) } } class NativeSubscribeHttp( val channel: Events.Channel, - chain: Chain, + chain: Chain ) : Base(), RequestReply, Long> { diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt index d18ff731..4de9bbef 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/CurrentMultistreamHolder.kt @@ -24,7 +24,10 @@ import io.emeraldpay.dshackle.upstream.bitcoin.BitcoinUpstream import io.emeraldpay.dshackle.upstream.calls.CallMethods import io.emeraldpay.dshackle.upstream.calls.DefaultBitcoinMethods 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.Chain import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/BitcoinMultistream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/BitcoinMultistream.kt index adaf1a0a..d72a3fb5 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/BitcoinMultistream.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/bitcoin/BitcoinMultistream.kt @@ -26,9 +26,8 @@ import io.emeraldpay.dshackle.upstream.Multistream import io.emeraldpay.dshackle.upstream.RequestPostprocessor import io.emeraldpay.dshackle.upstream.Selector 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.forkchoice.MostWorkForkChoice import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcRequest import io.emeraldpay.dshackle.upstream.rpcclient.JsonRpcResponse import io.emeraldpay.grpc.Chain @@ -93,8 +92,8 @@ open class BitcoinMultistream( } } else { val newHead = MergedHead(sourceUpstreams.map { it.getHead() }, MostWorkForkChoice()).apply { - this.start() - } + this.start() + } val lagObserver = BitcoinHeadLagObserver(newHead, sourceUpstreams) this.lagObserver = lagObserver lagObserver.start()