mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-21 14:14:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make newConfigOfType use Vector[Config] (#4039)

Browse source
This commit is contained in:
benthecarman 2022-02-04 06:14:16 -06:00 • committed by GitHub
parent afc6a32c62
commit 142612f034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-commons/src/main/scala/org/bitcoins/commons/config/AppConfig.scala
View file

@ -40,7 +40,7 @@ abstract class AppConfig extends StartStopAsync[Unit] with Logging {
/** Constructor to make a new instance of this config type */
protected[bitcoins] def newConfigOfType(
configOverrides: Seq[Config]): ConfigType
configOverrides: Vector[Config]): ConfigType
/** List of user-provided configs that should
* override defaults

4
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindRpcAppConfig.scala
View file

@ -30,8 +30,8 @@ case class BitcoindRpcAppConfig(
override protected[bitcoins] type ConfigType = BitcoindRpcAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): BitcoindRpcAppConfig =
BitcoindRpcAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): BitcoindRpcAppConfig =
BitcoindRpcAppConfig(baseDatadir, configs)
override def start(): Future[Unit] = Future.unit

4
chain/src/main/scala/org/bitcoins/chain/config/ChainAppConfig.scala
View file

@ -28,8 +28,8 @@ case class ChainAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = ChainAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): ChainAppConfig =
ChainAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): ChainAppConfig =
ChainAppConfig(baseDatadir, configs)
override lazy val appConfig: ChainAppConfig = this

4
dlc-node/src/main/scala/org/bitcoins/dlc/node/config/DLCNodeAppConfig.scala
View file

@ -28,8 +28,8 @@ case class DLCNodeAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = DLCNodeAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): DLCNodeAppConfig =
DLCNodeAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): DLCNodeAppConfig =
DLCNodeAppConfig(baseDatadir, configs)
override def start(): Future[Unit] = {
FutureUtil.unit

5
dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/config/DLCOracleAppConfig.scala
View file

@ -38,9 +38,8 @@ case class DLCOracleAppConfig(
override type ConfigType = DLCOracleAppConfig
override def newConfigOfType(
configOverrides: Seq[Config]): DLCOracleAppConfig =
DLCOracleAppConfig(baseDatadir, configOverrides.toVector)
override def newConfigOfType(configs: Vector[Config]): DLCOracleAppConfig =
DLCOracleAppConfig(baseDatadir, configs)
/** DLC oracles are not network specific, so just hard code the testnet chain params */
final override lazy val chain: BitcoinChainParams = TestNetChainParams

4
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCAppConfig.scala
View file

@ -38,8 +38,8 @@ case class DLCAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = DLCAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): DLCAppConfig =
DLCAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): DLCAppConfig =
DLCAppConfig(baseDatadir, configs)
override def appConfig: DLCAppConfig = this

5
key-manager/src/main/scala/org/bitcoins/keymanager/config/KeyManagerAppConfig.scala
View file

@ -22,9 +22,8 @@ case class KeyManagerAppConfig(
override type ConfigType = KeyManagerAppConfig
override def newConfigOfType(
configOverrides: Seq[Config]): KeyManagerAppConfig =
KeyManagerAppConfig(baseDatadir, configOverrides.toVector)
override def newConfigOfType(configs: Vector[Config]): KeyManagerAppConfig =
KeyManagerAppConfig(baseDatadir, configs)
override def moduleName: String = KeyManagerAppConfig.moduleName

4
node/src/main/scala/org/bitcoins/node/config/NodeAppConfig.scala
View file

@ -37,8 +37,8 @@ case class NodeAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = NodeAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): NodeAppConfig =
NodeAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): NodeAppConfig =
NodeAppConfig(baseDatadir, configs)
implicit override def ec: ExecutionContext = system.dispatcher

6
testkit/src/main/scala/org/bitcoins/testkit/db/DbTestUtil.scala
View file

@ -1,6 +1,5 @@
package org.bitcoins.testkit.db
import java.nio.file.{Files, Path}
import akka.actor.ActorSystem
import com.typesafe.config.Config
import org.bitcoins.db._
@ -8,6 +7,7 @@ import org.bitcoins.db.models.MasterXPubDAO
import scodec.bits.ByteVector
import slick.lifted.ProvenShape
import java.nio.file.{Files, Path}
import scala.concurrent.{ExecutionContext, Future}
object DbTestUtil {
@ -52,8 +52,8 @@ case class TestAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = TestAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): TestAppConfig =
TestAppConfig(baseDatadir, configOverrides)
configs: Vector[Config]): TestAppConfig =
TestAppConfig(baseDatadir, configs)
override def appConfig: TestAppConfig = this

4
tor/src/main/scala/org/bitcoins/tor/config/TorAppConfig.scala
View file

@ -28,8 +28,8 @@ case class TorAppConfig(
override protected[bitcoins] type ConfigType = TorAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): TorAppConfig =
TorAppConfig(baseDatadir, subModuleNameOpt, configs.toVector)
configs: Vector[Config]): TorAppConfig =
TorAppConfig(baseDatadir, subModuleNameOpt, configs)
private val isStarted: AtomicBoolean = new AtomicBoolean(false)

6
wallet/src/main/scala/org/bitcoins/wallet/config/WalletAppConfig.scala
View file

@ -8,8 +8,8 @@ import org.bitcoins.core.api.feeprovider.FeeRateApi
import org.bitcoins.core.api.node.NodeApi
import org.bitcoins.core.hd._
import org.bitcoins.core.util.Mutable
import org.bitcoins.core.wallet.keymanagement._
import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
import org.bitcoins.core.wallet.keymanagement._
import org.bitcoins.crypto.AesPassword
import org.bitcoins.db.DatabaseDriver.{PostgreSQL, SQLite}
import org.bitcoins.db._
@ -44,8 +44,8 @@ case class WalletAppConfig(baseDatadir: Path, configOverrides: Vector[Config])(
override protected[bitcoins] type ConfigType = WalletAppConfig
override protected[bitcoins] def newConfigOfType(
configs: Seq[Config]): WalletAppConfig =
WalletAppConfig(baseDatadir, configs.toVector)
configs: Vector[Config]): WalletAppConfig =
WalletAppConfig(baseDatadir, configs)
override def appConfig: WalletAppConfig = this