2024 03 18 rm unused configs (#5480)

* Remove bitcoin-s.node.connection-timout setting as it wasn't used

* Remove bitcoin-s.node.peer-discovery-timeout
This commit is contained in:
Chris Stewart 2024-03-18 15:26:31 -05:00 committed by GitHub
parent d44344f07b
commit af342dd6c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 19 deletions

View file

@ -159,9 +159,6 @@ bitcoin-s {
# number of persistent peer connections to maintain for node use
maxConnectedPeers = 1
# peers discovery configs, ideally you would not want to change this
# timeout for tcp connection
connection-timeout = 5s
# time interval for trying next set of peers in peer discovery
try-peers-interval = 12 hour

View file

@ -18,7 +18,7 @@ import org.bitcoins.tor.TorParams
import org.bitcoins.tor.config.TorAppConfig
import java.nio.file.Path
import java.time.{Duration, Instant}
import java.time.{Instant}
import scala.concurrent.duration.{DurationInt, FiniteDuration}
import scala.concurrent.{ExecutionContext, Future}
@ -134,21 +134,6 @@ case class NodeAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
else false
}
// https://github.com/lightbend/config/blob/master/HOCON.md#duration-format
lazy val peerDiscoveryTimeout: Duration = {
if (config.hasPath("bitcoin-s.node.peer-discovery-timeout"))
config.getDuration("bitcoin-s.node.peer-discovery-timeout")
else Duration.ofMinutes(10)
}
/** timeout for tcp connection in P2PClient */
lazy val connectionTimeout: FiniteDuration = {
if (config.hasPath("bitcoin-s.node.connection-timeout")) {
val duration = config.getDuration("bitcoin-s.node.connection-timeout")
TimeUtil.durationToFiniteDuration(duration)
} else 5.seconds
}
lazy val tryPeersStartDelay: FiniteDuration = {
if (config.hasPath("bitcoin-s.node.try-peers-start-delay")) {
val duration = config.getDuration("bitcoin-s.node.try-peers-start-delay")