From 4ef27dd1633b8898fa096371149fc98e428be5f6 Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Sun, 24 Jul 2022 16:48:25 -0500 Subject: [PATCH] Fix bug where dlcNode was not apart of tor dependent configs (#4537) --- .../org/bitcoins/server/BitcoinSAppConfig.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala index 89c35d7da3..6e6db8f282 100644 --- a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala +++ b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala @@ -56,17 +56,17 @@ case class BitcoinSAppConfig( lazy val dlcNodeConf: DLCNodeAppConfig = DLCNodeAppConfig(baseDatadir, configOverrides) - def copyWithConfig(newConfs: Vector[Config]): BitcoinSAppConfig = { - val configs = newConfs ++ configOverrides - BitcoinSAppConfig(baseDatadir, configs) - } - lazy val kmConf: KeyManagerAppConfig = KeyManagerAppConfig(baseDatadir, configOverrides) lazy val bitcoindRpcConf: BitcoindRpcAppConfig = BitcoindRpcAppConfig(baseDatadir, configOverrides) + def copyWithConfig(newConfs: Vector[Config]): BitcoinSAppConfig = { + val configs = newConfs ++ configOverrides + BitcoinSAppConfig(baseDatadir, configs) + } + lazy val network: NetworkParameters = chainConf.network /** Initializes the wallet, node and chain projects */ @@ -77,7 +77,8 @@ case class BitcoinSAppConfig( val nonTorConfigs = Vector(kmConf, chainConf, walletConf) val torConfig = torConf.start() - val torDependentConfigs = Vector(nodeConf, bitcoindRpcConf, dlcConf) + val torDependentConfigs = + Vector(nodeConf, bitcoindRpcConf, dlcConf, dlcNodeConf) val startedTorDependentConfigsF = for { _ <- torConfig