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

Merge branch 'android' into android-phoenix

Browse source 
Release 0.3.6-android-phoenix-RC1
This commit is contained in:
dpad85 2020-01-23 11:27:52 +01:00
commit 7df9b79819
No known key found for this signature in database
GPG key ID: 574C8C6A1673E987
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eclair-core/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.3.6-android-phoenix-SNAPSHOT</version>
<version>0.3.6-android-phoenix-RC1</version>
</parent>
<artifactId>eclair-core_2.11</artifactId>

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

@ -177,7 +177,7 @@ class Setup(datadir: File,
}
minFeeratePerByte = config.getLong("min-feerate")
smoothFeerateWindow = config.getInt("smooth-feerate-window")
readTimeout = FiniteDuration(config.getDuration("feerate-provider-timeout", TimeUnit.SECONDS), TimeUnit.MILLISECONDS)
readTimeout = FiniteDuration(config.getDuration("feerate-provider-timeout", TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS)
feeProvider = (nodeParams.chainHash, bitcoin) match {
case (Block.RegtestGenesisBlock.hash, _) => new FallbackFeeProvider(new ConstantFeeProvider(defaultFeerates) :: Nil, minFeeratePerByte)
case _ =>

2
eclair-core/src/main/scala/fr/acinq/eclair/io/Peer.scala
View file

@ -810,7 +810,7 @@ object Peer {
/**
* This helps preventing peers reconnection loops due to synchronization of reconnection attempts.
*/
def randomizeDelay(initialRandomReconnectDelay: FiniteDuration): FiniteDuration = Random.nextInt(initialRandomReconnectDelay.toMillis.toInt).millis
def randomizeDelay(initialRandomReconnectDelay: FiniteDuration): FiniteDuration = Random.nextInt(initialRandomReconnectDelay.toMillis.toInt).millis.max(200 milliseconds)
/**
* Exponential backoff retry with a finite max

1
eclair-core/src/test/scala/fr/acinq/eclair/io/PeerSpec.scala
View file

@ -199,6 +199,7 @@ class PeerSpec extends TestkitBaseClass with StateTestsHelperMethods {
probe.send(transport.ref, PoisonPill)
awaitCond(peer.stateName === DISCONNECTED)
val initialReconnectDelay = peer.stateData.asInstanceOf[DisconnectedData].nextReconnectionDelay
assert(initialReconnectDelay >= (200 milliseconds))
assert(initialReconnectDelay <= (10 seconds))
probe.send(peer, Reconnect)
assert(peer.stateData.asInstanceOf[DisconnectedData].nextReconnectionDelay === (initialReconnectDelay * 2))

2
eclair-node/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.3.6-android-phoenix-SNAPSHOT</version>
<version>0.3.6-android-phoenix-RC1</version>
</parent>
<artifactId>eclair-node_2.11</artifactId>

2
pom.xml
View file

@ -20,7 +20,7 @@
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.3.6-android-phoenix-SNAPSHOT</version>
<version>0.3.6-android-phoenix-RC1</version>
<packaging>pom</packaging>
<modules>