diff --git a/server/app/com/xsn/explorer/models/TransactionDetails.scala b/server/app/com/xsn/explorer/models/TransactionDetails.scala index ce2dac3..fdaae48 100644 --- a/server/app/com/xsn/explorer/models/TransactionDetails.scala +++ b/server/app/com/xsn/explorer/models/TransactionDetails.scala @@ -1,5 +1,6 @@ package com.xsn.explorer.models +import com.xsn.explorer.models.rpc.Transaction import play.api.libs.json.{Json, Writes} case class TransactionDetails( diff --git a/server/app/com/xsn/explorer/models/Transaction.scala b/server/app/com/xsn/explorer/models/rpc/Transaction.scala similarity index 93% rename from server/app/com/xsn/explorer/models/Transaction.scala rename to server/app/com/xsn/explorer/models/rpc/Transaction.scala index 62c8993..ae1e39f 100644 --- a/server/app/com/xsn/explorer/models/Transaction.scala +++ b/server/app/com/xsn/explorer/models/rpc/Transaction.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._ diff --git a/server/app/com/xsn/explorer/services/XSNService.scala b/server/app/com/xsn/explorer/services/XSNService.scala index 6054176..049c048 100644 --- a/server/app/com/xsn/explorer/services/XSNService.scala +++ b/server/app/com/xsn/explorer/services/XSNService.scala @@ -8,7 +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 com.xsn.explorer.models.rpc.{Block, Transaction} import org.scalactic.{Bad, Good} import org.slf4j.LoggerFactory import play.api.libs.json.{JsNull, JsValue, Reads} diff --git a/server/app/com/xsn/explorer/services/logic/BlockLogic.scala b/server/app/com/xsn/explorer/services/logic/BlockLogic.scala index 703244f..8e3f833 100644 --- a/server/app/com/xsn/explorer/services/logic/BlockLogic.scala +++ b/server/app/com/xsn/explorer/services/logic/BlockLogic.scala @@ -3,7 +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 com.xsn.explorer.models.rpc.{Block, Transaction} import org.scalactic.{Bad, Good, One, Or} class BlockLogic { diff --git a/server/app/com/xsn/explorer/services/logic/TransactionLogic.scala b/server/app/com/xsn/explorer/services/logic/TransactionLogic.scala index 1d99e51..61ef135 100644 --- a/server/app/com/xsn/explorer/services/logic/TransactionLogic.scala +++ b/server/app/com/xsn/explorer/services/logic/TransactionLogic.scala @@ -2,7 +2,8 @@ package com.xsn.explorer.services.logic import com.alexitc.playsonify.core.ApplicationResult import com.alexitc.playsonify.models.ApplicationError -import com.xsn.explorer.models.{Address, Transaction, TransactionVIN, TransactionVOUT} +import com.xsn.explorer.models.rpc.Transaction +import com.xsn.explorer.models.{Address, TransactionVIN, TransactionVOUT} import org.scalactic.{One, Or} class TransactionLogic { diff --git a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala index 2e37ec1..b53e689 100644 --- a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala +++ b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala @@ -2,7 +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.models.rpc.{Block, Transaction} import com.xsn.explorer.services.XSNService class DummyXSNService extends XSNService { diff --git a/server/test/controllers/BlocksControllerSpec.scala b/server/test/controllers/BlocksControllerSpec.scala index 7f7254e..d26a202 100644 --- a/server/test/controllers/BlocksControllerSpec.scala +++ b/server/test/controllers/BlocksControllerSpec.scala @@ -5,7 +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.models.rpc.{Block, Transaction} import com.xsn.explorer.services.XSNService import controllers.common.MyAPISpec import org.scalactic.{Bad, Good} diff --git a/server/test/controllers/TransactionsControllerSpec.scala b/server/test/controllers/TransactionsControllerSpec.scala index 7fb214b..01fc286 100644 --- a/server/test/controllers/TransactionsControllerSpec.scala +++ b/server/test/controllers/TransactionsControllerSpec.scala @@ -5,6 +5,7 @@ import com.alexitc.playsonify.core.FutureApplicationResult import com.xsn.explorer.errors.TransactionNotFoundError import com.xsn.explorer.helpers.{DataHelper, DummyXSNService} import com.xsn.explorer.models._ +import com.xsn.explorer.models.rpc.Transaction import com.xsn.explorer.services.XSNService import controllers.common.MyAPISpec import org.scalactic.{Bad, Good}