server: Move Block model to rpc package

7 years ago · 850b8192ed
7 changed files with 8 additions and 1 deletions
--- a/server/app/com/xsn/explorer/models/BlockDetails.scala
+++ b/server/app/com/xsn/explorer/models/BlockDetails.scala
@ -1,5 +1,6 @@
 package com.xsn.explorer.models

+import com.xsn.explorer.models.rpc.Block
 import play.api.libs.json.{Json, Writes}

 case class BlockDetails(block: Block, rewards: BlockRewards)
--- a/server/app/com/xsn/explorer/models/rpc/Block.scala
+++ b/server/app/com/xsn/explorer/models/rpc/Block.scala
@ -1,5 +1,6 @@
-package com.xsn.explorer.models
+package com.xsn.explorer.models.rpc

+import com.xsn.explorer.models._
 import play.api.libs.functional.syntax._
 import play.api.libs.json._

--- a/server/app/com/xsn/explorer/services/BlockService.scala
+++ b/server/app/com/xsn/explorer/services/BlockService.scala
@ -6,6 +6,7 @@ import com.alexitc.playsonify.core.FutureApplicationResult
 import com.alexitc.playsonify.core.FutureOr.Implicits.{FutureOps, OrOps}
 import com.xsn.explorer.errors.BlockNotFoundError
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.rpc.Block
 import com.xsn.explorer.services.logic.{BlockLogic, TransactionLogic}

 import scala.concurrent.ExecutionContext
--- a/server/app/com/xsn/explorer/services/XSNService.scala
+++ b/server/app/com/xsn/explorer/services/XSNService.scala
@ -8,6 +8,7 @@ import com.xsn.explorer.config.RPCConfig
 import com.xsn.explorer.errors._
 import com.xsn.explorer.executors.ExternalServiceExecutionContext
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.rpc.Block
 import org.scalactic.{Bad, Good}
 import org.slf4j.LoggerFactory
 import play.api.libs.json.{JsNull, JsValue, Reads}
--- a/server/app/com/xsn/explorer/services/logic/BlockLogic.scala
+++ b/server/app/com/xsn/explorer/services/logic/BlockLogic.scala
@ -3,6 +3,7 @@ package com.xsn.explorer.services.logic
 import com.alexitc.playsonify.core.ApplicationResult
 import com.xsn.explorer.errors.{BlockNotFoundError, BlockhashFormatError}
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.rpc.Block
 import org.scalactic.{Bad, Good, One, Or}

 class BlockLogic {
--- a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
+++ b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
@ -2,6 +2,7 @@ package com.xsn.explorer.helpers

 import com.alexitc.playsonify.core.FutureApplicationResult
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.rpc.Block
 import com.xsn.explorer.services.XSNService

 class DummyXSNService extends XSNService {
--- a/server/test/controllers/BlocksControllerSpec.scala
+++ b/server/test/controllers/BlocksControllerSpec.scala
@ -5,6 +5,7 @@ import com.alexitc.playsonify.core.FutureApplicationResult
 import com.xsn.explorer.errors.{BlockNotFoundError, TransactionNotFoundError}
 import com.xsn.explorer.helpers.{DataHelper, DummyXSNService}
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.rpc.Block
 import com.xsn.explorer.services.XSNService
 import controllers.common.MyAPISpec
 import org.scalactic.{Bad, Good}