From 3db7b176d363fd0f6d8ca6c64750e45e44e9db1b Mon Sep 17 00:00:00 2001 From: Pierre-Marie Padiou Date: Thu, 21 Feb 2019 16:02:39 +0100 Subject: [PATCH] Update jeromq dependency (#852) * jeromq 0.4.0->0.5.0 --- eclair-core/pom.xml | 2 +- .../fr/acinq/eclair/blockchain/bitcoind/zmq/ZMQActor.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclair-core/pom.xml b/eclair-core/pom.xml index 698150e33..679f4a591 100644 --- a/eclair-core/pom.xml +++ b/eclair-core/pom.xml @@ -175,7 +175,7 @@ org.zeromq jeromq - 0.4.0 + 0.5.0 diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/zmq/ZMQActor.scala b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/zmq/ZMQActor.scala index f30551488..29daecbcb 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/zmq/ZMQActor.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/zmq/ZMQActor.scala @@ -21,7 +21,7 @@ import akka.actor.{Actor, ActorLogging} import fr.acinq.bitcoin.{Block, Transaction} import fr.acinq.eclair.blockchain.{NewBlock, NewTransaction} import org.zeromq.ZMQ.Event -import org.zeromq.{ZContext, ZMQ, ZMsg} +import org.zeromq.{SocketType, ZContext, ZMQ, ZMsg} import scala.annotation.tailrec import scala.concurrent.{ExecutionContext, Promise} @@ -37,13 +37,13 @@ class ZMQActor(address: String, connected: Option[Promise[Done]] = None) extends val ctx = new ZContext - val subscriber = ctx.createSocket(ZMQ.SUB) + val subscriber = ctx.createSocket(SocketType.SUB) subscriber.monitor("inproc://events", ZMQ.EVENT_CONNECTED | ZMQ.EVENT_DISCONNECTED) subscriber.connect(address) subscriber.subscribe("rawblock".getBytes(ZMQ.CHARSET)) subscriber.subscribe("rawtx".getBytes(ZMQ.CHARSET)) - val monitor = ctx.createSocket(ZMQ.PAIR) + val monitor = ctx.createSocket(SocketType.PAIR) monitor.connect("inproc://events") implicit val ec: ExecutionContext = context.system.dispatcher