mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-13 19:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into wip-android

Browse source
This commit is contained in:
pm47 2018-03-15 11:33:52 +01:00
commit dabce9c1b9
No known key found for this signature in database
GPG key ID: E434ED292E85643A
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala
View file

@ -12,7 +12,6 @@ import fr.acinq.eclair.blockchain.fee.{ConstantFeeProvider, _}
import fr.acinq.eclair.blockchain.{EclairWallet, _}
import fr.acinq.eclair.channel.Register
import fr.acinq.eclair.crypto.LocalKeyManager
import fr.acinq.eclair.io.{Authenticator, Server, Switchboard}
import fr.acinq.eclair.io.{Authenticator, Switchboard}
import fr.acinq.eclair.payment._
import fr.acinq.eclair.router._
@ -92,11 +91,9 @@ class Setup(datadir: File, wallet_opt: Option[EclairWallet] = None, overrideDefa
val wallet = bitcoin match {
case _ if wallet_opt.isDefined => wallet_opt.get
case Electrum(electrumClient) => seed_opt match {
case Some(seed) => val electrumWallet = system.actorOf(ElectrumWallet.props(seed, electrumClient, ElectrumWallet.WalletParameters(Block.TestnetGenesisBlock.hash)), "electrum-wallet")
new ElectrumEclairWallet(electrumWallet)
case _ => throw new RuntimeException("electrum wallet requires a seed to set up")
}
case Electrum(electrumClient) =>
val electrumWallet = system.actorOf(ElectrumWallet.props(seed, electrumClient, ElectrumWallet.WalletParameters(Block.TestnetGenesisBlock.hash)), "electrum-wallet")
new ElectrumEclairWallet(electrumWallet)
case _ => ???
}