[ETCM-331] Minor Fixes - updates based on review

input-output-hk · Dec 1, 2020 · 6e82731 · 6e82731
1 parent 341db30
commit 6e82731
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
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
@@ -26,7 +26,7 @@ import com.typesafe.config.{Config => TypesafeConfig}
 
 import scala.concurrent.duration.{FiniteDuration, _}
 
-trait JsonRpcHttpServer extends Json4sSupport with RateLimit {
+trait JsonRpcHttpServer extends Json4sSupport with RateLimit with Logger {
   val jsonRpcController: JsonRpcBaseController
   val jsonRpcHealthChecker: JsonRpcHealthChecker
   val config: JsonRpcHttpServerConfig

diff --git a/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/RateLimit.scala b/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/RateLimit.scala
@@ -5,9 +5,8 @@ import java.time.Clock
 import akka.http.scaladsl.model.RemoteAddress
 import com.twitter.util.LruMap
 import io.iohk.ethereum.jsonrpc.server.http.JsonRpcHttpServer.JsonRpcHttpServerConfig
-import io.iohk.ethereum.utils.Logger
 
-trait RateLimit extends Logger {
+trait RateLimit {
 
   val config: JsonRpcHttpServerConfig
 

diff --git a/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/SecureJsonRpcHttpServer.scala b/src/main/scala/io/iohk/ethereum/jsonrpc/server/http/SecureJsonRpcHttpServer.scala
@@ -18,7 +18,7 @@ import scala.util.{Failure, Success}
 class SecureJsonRpcHttpServer(
     val jsonRpcController: JsonRpcBaseController,
     val jsonRpcHealthChecker: JsonRpcHealthChecker,
-    override val config: JsonRpcHttpServerConfig,
+    val config: JsonRpcHttpServerConfig,
     secureRandom: SecureRandom,
     getSSLContext: () => Either[SSLError, SSLContext]
 )(implicit val actorSystem: ActorSystem)

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
@@ -241,26 +241,26 @@ class JsonRpcHttpServerSpec extends AnyFlatSpec with Matchers with ScalatestRout
     val fakeClock = new FakeClock
 
     val mockJsonRpcHttpServer = new FakeJsonRpcHttpServer(
-      mockJsonRpcController,
-      mockJsonRpcHealthChecker,
-      serverConfig,
-      serverConfig.corsAllowedOrigins,
-      fakeClock)
+      jsonRpcController = mockJsonRpcController,
+      jsonRpcHealthChecker = mockJsonRpcHealthChecker,
+      config = serverConfig,
+      cors = serverConfig.corsAllowedOrigins,
+      testClock = fakeClock)
 
     val corsAllowedOrigin = HttpOrigin("http://localhost:3333")
     val mockJsonRpcHttpServerWithCors = new FakeJsonRpcHttpServer(
-      mockJsonRpcController,
-      mockJsonRpcHealthChecker,
-      serverConfig,
-      HttpOriginMatcher(corsAllowedOrigin),
-      fakeClock)
+      jsonRpcController = mockJsonRpcController,
+      jsonRpcHealthChecker = mockJsonRpcHealthChecker,
+      config = serverConfig,
+      cors = HttpOriginMatcher(corsAllowedOrigin),
+      testClock = fakeClock)
 
     val mockJsonRpcHttpServerWithRateLimit = new FakeJsonRpcHttpServer(
-      mockJsonRpcController,
-      mockJsonRpcHealthChecker,
-      serverConfigWithRateLimit,
-      serverConfigWithRateLimit.corsAllowedOrigins,
-      fakeClock)
+      jsonRpcController = mockJsonRpcController,
+      jsonRpcHealthChecker = mockJsonRpcHealthChecker,
+      config = serverConfigWithRateLimit,
+      cors = serverConfigWithRateLimit.corsAllowedOrigins,
+      testClock = fakeClock)
   }
 }