mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-15 04:11:33 +01:00
Code Issues Projects Releases Wiki Activity

merged from master

Browse source
This commit is contained in:
pm47 2017-09-07 00:22:17 +02:00
commit 7511fbfc24
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eclair-core/src/main/resources/reference.conf
View file

@ -21,7 +21,12 @@ eclair {
} }
bitcoinj { bitcoinj {
# port = 28333 // used in integration tests to override default port static-peers = [
#{ // currently used in integration tests to override default port
# host = "localhost"
# port = 28333
#}
]
} }
node-alias = "eclair" node-alias = "eclair"

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

@ -1,6 +1,7 @@
package fr.acinq.eclair package fr.acinq.eclair
import java.io.File import java.io.File
import java.net.InetSocketAddress
import akka.actor.{ActorRef, ActorSystem, Props, SupervisorStrategy} import akka.actor.{ActorRef, ActorSystem, Props, SupervisorStrategy}
import akka.util.Timeout import akka.util.Timeout
@ -15,6 +16,7 @@ import fr.acinq.eclair.payment._
import fr.acinq.eclair.router._ import fr.acinq.eclair.router._
import grizzled.slf4j.Logging import grizzled.slf4j.Logging
import scala.collection.JavaConversions._
import scala.concurrent.duration._ import scala.concurrent.duration._
import scala.concurrent.{ExecutionContext, Future} import scala.concurrent.{ExecutionContext, Future}
@ -42,7 +44,9 @@ class Setup(datadir: File, wallet_opt: Option[EclairWallet] = None, overrideDefa
val bitcoin = if (spv) { val bitcoin = if (spv) {
logger.warn("EXPERIMENTAL SPV MODE ENABLED!!!") logger.warn("EXPERIMENTAL SPV MODE ENABLED!!!")
val bitcoinjKit = new BitcoinjKit(chain, datadir) val staticPeers = config.getConfigList("bitcoinj.static-peers").map(c => new InetSocketAddress(c.getString("host"), c.getInt("port"))).toList
logger.info(s"using staticPeers=$staticPeers")
val bitcoinjKit = new BitcoinjKit(chain, datadir, staticPeers)
Left(bitcoinjKit) Left(bitcoinjKit)
} else ??? } else ???

2
eclair-core/src/test/scala/fr/acinq/eclair/integration/BasicIntegrationSpvSpec.scala
View file

@ -127,7 +127,7 @@ class BasicIntegrationSpvSpec extends TestKit(ActorSystem("test")) with FunSuite
test("starting eclair nodes") { test("starting eclair nodes") {
import collection.JavaConversions._ import collection.JavaConversions._
val commonConfig = ConfigFactory.parseMap(Map("eclair.chain" -> "regtest", "eclair.spv" -> true, "eclair.chain" -> "regtest", "eclair.bitcoinj.port" -> 28333, "eclair.server.public-ips.1" -> "localhost", "eclair.bitcoind.port" -> 28333, "eclair.bitcoind.rpcport" -> 28332, "eclair.bitcoind.zmq" -> "tcp://127.0.0.1:28334", "eclair.router-broadcast-interval" -> "2 second", "eclair.auto-reconnect" -> false, "eclair.delay-blocks" -> 6)) val commonConfig = ConfigFactory.parseMap(Map("eclair.chain" -> "regtest", "eclair.spv" -> true, "eclair.chain" -> "regtest", "eclair.bitcoinj.static-peers.0.host" -> "localhost", "eclair.bitcoinj.static-peers.0.port" -> 28333, "eclair.server.public-ips.1" -> "localhost", "eclair.bitcoind.port" -> 28333, "eclair.bitcoind.rpcport" -> 28332, "eclair.bitcoind.zmq" -> "tcp://127.0.0.1:28334", "eclair.router-broadcast-interval" -> "2 second", "eclair.auto-reconnect" -> false, "eclair.delay-blocks" -> 6))
//instantiateEclairNode("A", ConfigFactory.parseMap(Map("eclair.node-alias" -> "A", "eclair.server.port" -> 29730, "eclair.api.port" -> 28080)).withFallback(commonConfig)) //instantiateEclairNode("A", ConfigFactory.parseMap(Map("eclair.node-alias" -> "A", "eclair.server.port" -> 29730, "eclair.api.port" -> 28080)).withFallback(commonConfig))
//instantiateEclairNode("B", ConfigFactory.parseMap(Map("eclair.node-alias" -> "B", "eclair.server.port" -> 29731, "eclair.api.port" -> 28081)).withFallback(commonConfig)) //instantiateEclairNode("B", ConfigFactory.parseMap(Map("eclair.node-alias" -> "B", "eclair.server.port" -> 29731, "eclair.api.port" -> 28081)).withFallback(commonConfig))
instantiateEclairNode("C", ConfigFactory.parseMap(Map("eclair.node-alias" -> "C", "eclair.server.port" -> 29732, "eclair.api.port" -> 28082)).withFallback(commonConfig)) instantiateEclairNode("C", ConfigFactory.parseMap(Map("eclair.node-alias" -> "C", "eclair.server.port" -> 29732, "eclair.api.port" -> 28082)).withFallback(commonConfig))

2
pom.xml
View file

@ -47,7 +47,7 @@
<scala.version.short>2.11</scala.version.short> <scala.version.short>2.11</scala.version.short>
<akka.version>2.3.14</akka.version> <akka.version>2.3.14</akka.version>
<bitcoinlib.version>0.9.13</bitcoinlib.version> <bitcoinlib.version>0.9.13</bitcoinlib.version>
<bitcoinj.version>0.15-rc1</bitcoinj.version> <bitcoinj.version>0.15-rc2</bitcoinj.version>
</properties> </properties>
<build> <build>