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

Have AppConfig use BitcoinNetwork.fromString (#1748)

Browse source
This commit is contained in:
Ben Carman 2020-08-04 07:51:56 -05:00 • committed by GitHub
parent a022fbaed1
commit 0978256818
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/org/bitcoins/core/config/NetworkParameters.scala
View file

@ -177,7 +177,7 @@ object BitcoinNetworks extends StringFactory[BitcoinNetwork] {
/** Uses the notation used in `bitcoin.conf` */
override def fromString(string: String): BitcoinNetwork =
string match {
string.toLowerCase match {
case "mainnet" => MainNet
case "main" => MainNet
case "testnet3" => TestNet3

19
db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala
View file

@ -4,13 +4,8 @@ import java.nio.file.{Files, Path, Paths}
import ch.qos.logback.classic.Level
import com.typesafe.config._
import org.bitcoins.core.config.{MainNet, NetworkParameters, RegTest, TestNet3}
import org.bitcoins.core.protocol.blockchain.{
ChainParams,
MainNetChainParams,
RegTestNetChainParams,
TestNetChainParams
}
import org.bitcoins.core.config._
import org.bitcoins.core.protocol.blockchain.ChainParams
import org.bitcoins.core.util.{BitcoinSLogger, StartStop}
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
@ -129,14 +124,8 @@ abstract class AppConfig extends LoggerConfig with StartStop[Unit] {
/** Chain parameters for the blockchain we're on */
lazy val chain: ChainParams = {
val networkStr = config.getString("network")
networkStr match {
case "mainnet" => MainNetChainParams
case "testnet3" => TestNetChainParams
case "regtest" => RegTestNetChainParams
case other: String =>
throw new IllegalArgumentException(
s"'$other' is not a recognized network! Available options: mainnet, testnet3, regtest")
}
BitcoinNetworks.fromString(networkStr).chainParams
}
/** The blockchain network we're on */