Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create fromConfig functions for AppConfigs #2170

Merged
merged 2 commits into from Oct 12, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,6 +1,6 @@
package org.bitcoins.server

import java.nio.file.Path
import java.nio.file.{Path, Paths}

import com.typesafe.config.{Config, ConfigFactory}
import org.bitcoins.chain.config.ChainAppConfig
Expand Down Expand Up @@ -81,6 +81,12 @@ case class BitcoinSAppConfig(
*/
object BitcoinSAppConfig {

def fromConfig(config: Config)(implicit
ec: ExecutionContext): BitcoinSAppConfig = {
val configDataDir: Path = Paths.get(config.getString("bitcoin-s.datadir"))
BitcoinSAppConfig(configDataDir, config)
}

/** Constructs an app configuration from the default Bitcoin-S
* data directory and given list of configuration overrides.
*/
Expand Down
22 changes: 22 additions & 0 deletions db-commons-test/src/test/scala/org/bitcoins/db/AppConfigTest.scala
Expand Up @@ -2,6 +2,8 @@ package org.bitcoins.db

import com.typesafe.config.ConfigFactory
import org.bitcoins.core.config.TestNet3
import org.bitcoins.dlc.oracle.DLCOracleAppConfig
import org.bitcoins.server.BitcoinSAppConfig
import org.bitcoins.testkit.BitcoinSTestAppConfig
import org.bitcoins.testkit.util.BitcoinSAsyncTest
import org.bitcoins.wallet.config.WalletAppConfig
Expand Down Expand Up @@ -46,6 +48,26 @@ class AppConfigTest extends BitcoinSAsyncTest {
assert(walletConf.dbName != nodeConf.dbName)
}

it must "create from config" in {
val dir = BitcoinSTestAppConfig.tmpDir().toAbsolutePath
val conf = ConfigFactory.parseString {
s"""
|bitcoin-s {
| datadir = $dir
|}
""".stripMargin
}

val appConfig = BitcoinSAppConfig.fromConfig(conf)
assert(appConfig.walletConf.baseDatadir == dir)
assert(appConfig.nodeConf.baseDatadir == dir)
assert(appConfig.chainConf.baseDatadir == dir)
assert(appConfig.bitcoindRpcConf.baseDatadir == dir)

val dlcOracleAppConfig = DLCOracleAppConfig.fromConfig(conf)
assert(dlcOracleAppConfig.baseDatadir == dir)
}

it must "fill in typesafe config variables correctly" in {
val datadir = BitcoinSTestAppConfig.tmpDir()
val walletAppConfig = WalletAppConfig(datadir)
Expand Down
@@ -1,13 +1,18 @@
package org.bitcoins.db

import java.nio.file.Path
import java.nio.file.{Path, Paths}

import com.typesafe.config.Config

import scala.concurrent.ExecutionContext

trait AppConfigFactory[C <: AppConfig] {

def fromConfig(config: Config)(implicit ec: ExecutionContext): C = {
benthecarman marked this conversation as resolved.
Show resolved Hide resolved
val configDataDir: Path = Paths.get(config.getString("bitcoin-s.datadir"))
fromDatadir(configDataDir, Vector(config))
}

def fromDefaultDatadir(confs: Vector[Config] = Vector.empty)(implicit
ec: ExecutionContext): C = {
fromDatadir(AppConfig.DEFAULT_BITCOIN_S_DATADIR, confs)
Expand Down
@@ -1,12 +1,12 @@
package org.bitcoins.dlc.oracle

import java.nio.file.{Files, Path}
import java.nio.file.{Files, Path, Paths}

import com.typesafe.config.Config
import org.bitcoins.core.config.NetworkParameters
import org.bitcoins.core.crypto.ExtKeyVersion.SegWitMainNetPriv
import org.bitcoins.core.crypto.MnemonicCode
import org.bitcoins.core.util.{TimeUtil}
import org.bitcoins.core.util.TimeUtil
import org.bitcoins.crypto.AesPassword
import org.bitcoins.db.DatabaseDriver._
import org.bitcoins.db.{AppConfig, DbManagement, JdbcProfileComponent}
Expand Down Expand Up @@ -123,3 +123,12 @@ case class DLCOracleAppConfig(
override def allTables: List[TableQuery[Table[_]]] =
List(rValueTable, eventTable, eventOutcomeTable)
}

object DLCOracleAppConfig {

def fromConfig(config: Config)(implicit
ec: ExecutionContext): DLCOracleAppConfig = {
val configDataDir: Path = Paths.get(config.getString("bitcoin-s.datadir"))
DLCOracleAppConfig(configDataDir, config)
}
}