Merge branch 'develop' into release-v3.2.1-merge-back

kapke · web-flow · commit 9da36a2dc4e4 · 2020-12-10T14:32:36.000+01:00
diff --git a/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServer.scala b/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServer.scala
@@ -103,7 +103,7 @@ trait JsonRpcHttpServer extends Json4sSupport with RateLimit with Logger {
             entity = HttpEntity(ContentTypes.`application/json`, serialization.writePretty(response))
           )
       }
-    complete(httpResponseF)
+    complete(httpResponseF.runToFuture)
   }
 
   private def handleRequest(request: JsonRpcRequest) = {
diff --git a/src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherSpec.scala b/src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherSpec.scala
@@ -6,7 +6,7 @@ import akka.actor.ActorSystem
 import akka.testkit.{TestKit, TestProbe}
 import com.miguno.akka.testing.VirtualTime
 import io.iohk.ethereum.Mocks.{MockValidatorsAlwaysSucceed, MockValidatorsFailingOnBlockBodies}
-import io.iohk.ethereum.{BlockHelpers, Timeouts}
+import io.iohk.ethereum.{BlockHelpers, Timeouts, WithActorSystemShutDown}
 import io.iohk.ethereum.Fixtures.{Blocks => FixtureBlocks}
 import io.iohk.ethereum.blockchain.sync.PeersClient.BlacklistPeer
 import io.iohk.ethereum.blockchain.sync.regular.BlockFetcher.{InternalLastBlockImport, InvalidateBlocksFrom, PickBlocks}
@@ -24,7 +24,11 @@ import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.duration._
 
-class BlockFetcherSpec extends TestKit(ActorSystem("BlockFetcherSpec_System")) with AnyFreeSpecLike with Matchers {
+class BlockFetcherSpec
+    extends TestKit(ActorSystem("BlockFetcherSpec_System"))
+    with AnyFreeSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
 
   "BlockFetcher" - {
 
diff --git a/src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherStateSpec.scala b/src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherStateSpec.scala
@@ -3,14 +3,18 @@ package io.iohk.ethereum.blockchain.sync.regular
 import akka.actor.ActorSystem
 import akka.testkit.{TestKit, TestProbe}
 import io.iohk.ethereum.Mocks.MockValidatorsAlwaysSucceed
-import io.iohk.ethereum.BlockHelpers
+import io.iohk.ethereum.{BlockHelpers, WithActorSystemShutDown}
 import io.iohk.ethereum.network.PeerId
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
 import scala.collection.immutable.Queue
 
-class BlockFetcherStateSpec extends TestKit(ActorSystem()) with AnyWordSpecLike with Matchers {
+class BlockFetcherStateSpec
+    extends TestKit(ActorSystem("BlockFetcherStateSpec_System"))
+    with AnyWordSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
 
   lazy val validators = new MockValidatorsAlwaysSucceed
 
diff --git a/src/test/scala/io/iohk/ethereum/consensus/ethash/EthashMinerSpec.scala b/src/test/scala/io/iohk/ethereum/consensus/ethash/EthashMinerSpec.scala
@@ -3,7 +3,7 @@ package ethash
 
 import akka.actor.{ActorRef, ActorSystem}
 import akka.testkit.{TestActor, TestActorRef, TestKit, TestProbe}
-import io.iohk.ethereum.Fixtures
+import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
 import io.iohk.ethereum.consensus.blocks.{PendingBlock, PendingBlockAndState}
 import io.iohk.ethereum.consensus.ethash.validators.EthashBlockHeaderValidator
 import io.iohk.ethereum.consensus.validators.BlockHeaderValid
@@ -16,11 +16,17 @@ import monix.eval.Task
 import org.bouncycastle.util.encoders.Hex
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.Tag
+
 import scala.concurrent.duration._
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
 
-class EthashMinerSpec extends TestKit(ActorSystem("EthashMinerSpec_System")) with AnyFlatSpecLike with Matchers {
+class EthashMinerSpec
+    extends TestKit(ActorSystem("EthashMinerSpec_System"))
+    with AnyFlatSpecLike
+    with WithActorSystemShutDown
+    with Matchers {
+
   final val EthashMinerSpecTag = Tag("EthashMinerSpec")
 
   private implicit val timeout: Duration = 10.minutes
diff --git a/src/test/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServerSpec.scala b/src/test/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServerSpec.scala
@@ -3,7 +3,6 @@ package io.iohk.ethereum.jsonrpc.server.http
 import java.net.InetAddress
 import java.time.{Clock, Instant, ZoneId}
 import java.util.concurrent.TimeUnit
-
 import akka.actor.ActorSystem
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers.{HttpOrigin, Origin}
@@ -19,13 +18,33 @@ import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
 import akka.http.scaladsl.model.headers._
+import io.iohk.ethereum.healthcheck.{HealthcheckResponse, HealthcheckResult}
 import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.jsonrpc.server.controllers.JsonRpcBaseController
-
 import scala.concurrent.duration.FiniteDuration
 
 class JsonRpcHttpServerSpec extends AnyFlatSpec with Matchers with ScalatestRouteTest {
 
+  it should "respond to healthcheck" in new TestSetup {
+    (mockJsonRpcHealthChecker.healthCheck _)
+      .expects()
+      .returning(Task.now(HealthcheckResponse(List(HealthcheckResult("listening", "OK", None)))))
+
+    val getRequest = HttpRequest(HttpMethods.GET, uri = "/healthcheck")
+
+    getRequest ~> Route.seal(mockJsonRpcHttpServer.route) ~> check {
+      status shouldEqual StatusCodes.OK
+      responseAs[String] shouldEqual """{
+                                       |  "checks":[
+                                       |    {
+                                       |      "description":"listening",
+                                       |      "status":"OK"
+                                       |    }
+                                       |  ]
+                                       |}""".stripMargin
+    }
+  }
+
   it should "pass valid json request to controller" in new TestSetup {
     (mockJsonRpcController.handleRequest _)
       .expects(*)
diff --git a/src/test/scala/io/iohk/ethereum/network/PeerManagerSpec.scala b/src/test/scala/io/iohk/ethereum/network/PeerManagerSpec.scala
@@ -18,7 +18,7 @@ import io.iohk.ethereum.network.p2p.messages.CommonMessages.NewBlock
 import io.iohk.ethereum.network.p2p.messages.ProtocolVersions
 import io.iohk.ethereum.network.p2p.messages.WireProtocol.Disconnect
 import io.iohk.ethereum.utils.Config
-import io.iohk.ethereum.{Fixtures, NormalPatience}
+import io.iohk.ethereum.{Fixtures, NormalPatience, WithActorSystemShutDown}
 import org.bouncycastle.util.encoders.Hex
 import org.scalatest.concurrent.Eventually
 import org.scalatest.flatspec.AnyFlatSpecLike
@@ -28,6 +28,7 @@ import org.scalatest.matchers.should.Matchers
 class PeerManagerSpec
     extends TestKit(ActorSystem("PeerManagerSpec_System"))
     with AnyFlatSpecLike
+    with WithActorSystemShutDown
     with Matchers
     with Eventually
     with NormalPatience {
diff --git a/src/test/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManagerSpec.scala b/src/test/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManagerSpec.scala
@@ -1,33 +1,33 @@
 package io.iohk.ethereum.network.discovery
 
-import akka.pattern.ask
 import akka.actor.ActorSystem
+import akka.pattern.{AskTimeoutException, ask}
 import akka.testkit.{TestActorRef, TestKit}
 import akka.util.{ByteString, Timeout}
 import cats.effect.Resource
-import io.iohk.ethereum.NormalPatience
-import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.db.storage.KnownNodesStorage
+import io.iohk.ethereum.utils.Config
+import io.iohk.ethereum.{NormalPatience, WithActorSystemShutDown}
 import io.iohk.scalanet.discovery.crypto.PublicKey
 import io.iohk.scalanet.discovery.ethereum.v4.DiscoveryService
 import io.iohk.scalanet.discovery.ethereum.{Node => ENode}
 import monix.eval.Task
 import monix.execution.Scheduler
 import monix.execution.atomic.AtomicInt
-import org.scalatest.concurrent.Eventually
+import org.scalamock.scalatest.MockFactory
+import org.scalatest.concurrent.{Eventually, ScalaFutures}
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
-import org.scalatest.concurrent.ScalaFutures
-import org.scalamock.scalatest.MockFactory
-import scala.concurrent.duration._
 import scodec.bits.BitVector
-import scala.util.control.NoStackTrace
+
 import scala.collection.immutable.SortedSet
-import akka.pattern.AskTimeoutException
+import scala.concurrent.duration._
+import scala.util.control.NoStackTrace
 
 class PeerDiscoveryManagerSpec
     extends TestKit(ActorSystem("PeerDiscoveryManagerSpec_System"))
     with AnyFlatSpecLike
+    with WithActorSystemShutDown
     with Matchers
     with Eventually
     with MockFactory

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ trait JsonRpcHttpServer extends Json4sSupport with RateLimit with Logger {`
`103`	`103`	entity = HttpEntity(ContentTypes.`application/json`, serialization.writePretty(response))
`104`	`104`	`)`
`105`	`105`	`}`
`106`		`- complete(httpResponseF)`
	`106`	`+ complete(httpResponseF.runToFuture)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private def handleRequest(request: JsonRpcRequest) = {`