From f56be7e499ef8999f9111e10b21fe1d8f11f10e8 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Tue, 1 May 2018 08:49:04 -0500
Subject: [PATCH] Making sure ZMQSubscriberTest compiles

---
 .../org/bitcoins/zmq/ZMQSubscriber.scala      |  7 +---
 .../org/bitcoins/zmq/ZMQSubscriberTest.scala  | 38 ++++++-------------
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala b/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala
index 30d4508203..6d732fc222 100644
--- a/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala
+++ b/zmq/src/main/scala/org/bitcoins/zmq/ZMQSubscriber.scala
@@ -1,15 +1,10 @@
 package org.bitcoins.zmq
 
-import java.net.{ InetSocketAddress, Socket }
+import java.net.InetSocketAddress
 
-import org.bitcoins.core.crypto.{ DoubleSha256Digest, HashDigest }
-import org.bitcoins.core.protocol.blockchain.Block
-import org.bitcoins.core.protocol.transaction.Transaction
 import org.bitcoins.core.util.BitcoinSLogger
 import org.zeromq.{ ZMQ, ZMsg }
 
-import scala.concurrent.{ ExecutionContext, Future }
-
 /**
  * This class is designed to consume a zmq stream from a cryptocurrency's daemon.
  * An example of this is  bitcoind. For information on how to setup your coin's  conf
diff --git a/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala b/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala
index 0a7d72fb6f..4cafad3276 100644
--- a/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala
+++ b/zmq/src/test/scala/org/bitcoins/zmq/ZMQSubscriberTest.scala
@@ -2,15 +2,9 @@ package org.bitcoins.zmq
 
 import java.net.InetSocketAddress
 
-import org.bitcoins.core.crypto.DoubleSha256Digest
-import org.bitcoins.core.protocol.blockchain.Block
-import org.bitcoins.core.protocol.transaction.Transaction
+import org.bitcoins.core.util.BitcoinSUtil
 import org.scalatest.{ FlatSpec, MustMatchers }
 import org.slf4j.LoggerFactory
-
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.duration.DurationInt
-import scala.concurrent.{ Await, Future }
 class ZMQSubscriberTest extends FlatSpec with MustMatchers {
   private val logger = LoggerFactory.getLogger(this.getClass().toString)
   "ZMQSubscriber" must "connect to a regtest instance of a daemon and stream txs/blocks from it" in {
@@ -22,38 +16,30 @@ class ZMQSubscriberTest extends FlatSpec with MustMatchers {
 
     val zmqSub = new ZMQSubscriber(socket, None, None, rawTxListener, rawBlockListener)
     //stupid, doesn't test anything, for now. You need to look at log output to verify this is working
-    Await.result(zmqSub.start(), 100.seconds)
+    zmqSub.start()
+    Thread.sleep(100000) // 100 seconds
     zmqSub.stop
   }
 
-  val rawBlockListener: Option[Seq[Byte] => Future[Unit]] = Some {
+  val rawBlockListener: Option[Seq[Byte] => Unit] = Some {
     { bytes: Seq[Byte] =>
-      val block = Future(Block.fromBytes(bytes))
-      block.map { b =>
-        logger.debug(s"received block $b")
-        Future.successful(Unit)
-      }
+      val hex = BitcoinSUtil.encodeHex(bytes)
+      logger.debug(s"received raw block ${hex}")
     }
   }
 
-  val hashBlockListener: Option[Seq[Byte] => Future[Unit]] = Some {
+  val hashBlockListener: Option[Seq[Byte] => Unit] = Some {
     { bytes: Seq[Byte] =>
-      val hash = Future(DoubleSha256Digest.fromBytes(bytes))
-      hash.map { h =>
-        logger.debug(s"received block hash $h")
-        Future.successful(Unit)
-      }
+      val hex = BitcoinSUtil.encodeHex(bytes)
+      logger.debug(s"received raw block hash ${hex}")
 
     }
   }
 
-  val rawTxListener: Option[Seq[Byte] => Future[Unit]] = Some {
+  val rawTxListener: Option[Seq[Byte] => Unit] = Some {
     { bytes: Seq[Byte] =>
-      val txFuture = Future(Transaction.fromBytes(bytes))
-      txFuture.map { tx =>
-        logger.debug(s"received tx ${tx}")
-        Future.successful(Unit)
-      }
+      val hex = BitcoinSUtil.encodeHex(bytes)
+      logger.debug(s"received raw tx ${hex}")
     }
   }
 }