Improve integration tests (#710)

* added more logs and improved integration test

* make travis cache maven data

.travis.yml

@@ -9,6 +9,10 @@ env:
  - export LD_LIBRARY_PATH=/usr/local/lib
 script:
  - mvn install
+cache:
+ directories:
+  - .autoconf
+  - $HOME/.m2
 jdk:
  - oraclejdk8
 notifications:

eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala

@@ -810,7 +810,7 @@ class Channel(val nodeParams: NodeParams, wallet: EclairWallet, remoteNodeId: Pu
 
     case Event(TickRefreshChannelUpdate, d: DATA_NORMAL) =>
       // periodic refresh is used as a keep alive
-      log.debug(s"sending channel_update announcement (refresh)")
+      log.info(s"sending channel_update announcement (refresh)")
       val channelUpdate = Announcements.makeChannelUpdate(nodeParams.chainHash, nodeParams.privateKey, remoteNodeId, d.shortChannelId, d.channelUpdate.cltvExpiryDelta, d.channelUpdate.htlcMinimumMsat, d.channelUpdate.feeBaseMsat, d.channelUpdate.feeProportionalMillionths, enable = true)
       // we use GOTO instead of stay because we want to fire transitions
       goto(NORMAL) using store(d.copy(channelUpdate = channelUpdate))

eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala

@@ -261,10 +261,16 @@ class IntegrationSpec extends TestKit(ActorSystem("test")) with BitcoindService
     assert(sender.expectMsgType[Map[ChannelDesc, ChannelUpdate]].apply(ChannelDesc(channelUpdateBC.shortChannelId, nodes("B").nodeParams.nodeId, nodes("C").nodeParams.nodeId)) === channelUpdateBC)
     // we then put everything back like before by asking B to refresh its channel update (this will override the one we created)
     sender.send(nodes("B").register, ForwardShortId(shortIdBC, TickRefreshChannelUpdate))
+    sender.send(nodes("B").register, ForwardShortId(shortIdBC, CMD_GETINFO))
+    val channelUpdateBC_new = sender.expectMsgType[RES_GETINFO].data.asInstanceOf[DATA_NORMAL].channelUpdate
+    logger.info(s"channelUpdateBC=$channelUpdateBC")
+    logger.info(s"channelUpdateBC_new=$channelUpdateBC_new")
+    assert(channelUpdateBC_new.timestamp > channelUpdateBC.timestamp)
+    assert(channelUpdateBC_new.cltvExpiryDelta == nodes("B").nodeParams.expiryDeltaBlocks)
     awaitCond({
       sender.send(nodes("A").router, 'updatesMap)
       val u = sender.expectMsgType[Map[ChannelDesc, ChannelUpdate]].apply(ChannelDesc(channelUpdateBC.shortChannelId, nodes("B").nodeParams.nodeId, nodes("C").nodeParams.nodeId))
-      u.cltvExpiryDelta == 144
+      u.cltvExpiryDelta == nodes("B").nodeParams.expiryDeltaBlocks
     }, max = 30 seconds, interval = 1 second)
   }