diff --git a/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala b/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala index e544f12..c83d998 100644 --- a/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala +++ b/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala @@ -1,8 +1,7 @@ package com.xsn.explorer.data.anorm.parsers import anorm.SqlParser.{int, long, str} -import com.xsn.explorer.models.values._ -import com.xsn.explorer.models.Size +import com.xsn.explorer.models.values.{Size, _} object CommonParsers { diff --git a/server/app/com/xsn/explorer/models/LightWalletTransaction.scala b/server/app/com/xsn/explorer/models/LightWalletTransaction.scala index 5ab9ddf..dcf20ba 100644 --- a/server/app/com/xsn/explorer/models/LightWalletTransaction.scala +++ b/server/app/com/xsn/explorer/models/LightWalletTransaction.scala @@ -1,6 +1,6 @@ package com.xsn.explorer.models -import com.xsn.explorer.models.values.Blockhash +import com.xsn.explorer.models.values.{Blockhash, Size} import play.api.libs.json.{Json, Writes} case class LightWalletTransaction( diff --git a/server/app/com/xsn/explorer/models/TransactionDetails.scala b/server/app/com/xsn/explorer/models/TransactionDetails.scala index e138702..c901ba5 100644 --- a/server/app/com/xsn/explorer/models/TransactionDetails.scala +++ b/server/app/com/xsn/explorer/models/TransactionDetails.scala @@ -1,6 +1,6 @@ package com.xsn.explorer.models -import com.xsn.explorer.models.values.{Blockhash, Confirmations} +import com.xsn.explorer.models.values.{Blockhash, Confirmations, Size} import play.api.libs.json.{Json, Writes} case class TransactionDetails( diff --git a/server/app/com/xsn/explorer/models/TransactionWithValues.scala b/server/app/com/xsn/explorer/models/TransactionWithValues.scala index 5e54d9b..b5af4b2 100644 --- a/server/app/com/xsn/explorer/models/TransactionWithValues.scala +++ b/server/app/com/xsn/explorer/models/TransactionWithValues.scala @@ -1,6 +1,6 @@ package com.xsn.explorer.models -import com.xsn.explorer.models.values.Blockhash +import com.xsn.explorer.models.values.{Blockhash, Size} import play.api.libs.json.{Json, Writes} case class TransactionWithValues( diff --git a/server/app/com/xsn/explorer/models/persisted/Block.scala b/server/app/com/xsn/explorer/models/persisted/Block.scala index 331a229..f8af793 100644 --- a/server/app/com/xsn/explorer/models/persisted/Block.scala +++ b/server/app/com/xsn/explorer/models/persisted/Block.scala @@ -1,7 +1,7 @@ package com.xsn.explorer.models.persisted import com.xsn.explorer.models._ -import com.xsn.explorer.models.values.{Blockhash, Height} +import com.xsn.explorer.models.values.{Blockhash, Height, Size} import enumeratum._ case class Block( diff --git a/server/app/com/xsn/explorer/models/persisted/Transaction.scala b/server/app/com/xsn/explorer/models/persisted/Transaction.scala index 5d6295d..5d1631d 100644 --- a/server/app/com/xsn/explorer/models/persisted/Transaction.scala +++ b/server/app/com/xsn/explorer/models/persisted/Transaction.scala @@ -1,7 +1,7 @@ package com.xsn.explorer.models.persisted -import com.xsn.explorer.models.values.{Address, Blockhash, HexString} -import com.xsn.explorer.models.{Size, TransactionId, rpc} +import com.xsn.explorer.models.values.{Address, Blockhash, HexString, Size} +import com.xsn.explorer.models.{TransactionId, rpc} case class Transaction( id: TransactionId, diff --git a/server/app/com/xsn/explorer/models/rpc/Block.scala b/server/app/com/xsn/explorer/models/rpc/Block.scala index 7de0770..92ee882 100644 --- a/server/app/com/xsn/explorer/models/rpc/Block.scala +++ b/server/app/com/xsn/explorer/models/rpc/Block.scala @@ -1,7 +1,7 @@ package com.xsn.explorer.models.rpc import com.xsn.explorer.models._ -import com.xsn.explorer.models.values.{Blockhash, Confirmations, Height} +import com.xsn.explorer.models.values.{Blockhash, Confirmations, Height, Size} import play.api.libs.functional.syntax._ import play.api.libs.json._ diff --git a/server/app/com/xsn/explorer/models/rpc/Transaction.scala b/server/app/com/xsn/explorer/models/rpc/Transaction.scala index f78081b..8527061 100644 --- a/server/app/com/xsn/explorer/models/rpc/Transaction.scala +++ b/server/app/com/xsn/explorer/models/rpc/Transaction.scala @@ -1,7 +1,7 @@ package com.xsn.explorer.models.rpc import com.xsn.explorer.models._ -import com.xsn.explorer.models.values.{Blockhash, Confirmations} +import com.xsn.explorer.models.values.{Blockhash, Confirmations, Size} import play.api.libs.functional.syntax._ import play.api.libs.json._ diff --git a/server/app/com/xsn/explorer/models/Size.scala b/server/app/com/xsn/explorer/models/values/Size.scala similarity index 85% rename from server/app/com/xsn/explorer/models/Size.scala rename to server/app/com/xsn/explorer/models/values/Size.scala index c2cb817..426c65c 100644 --- a/server/app/com/xsn/explorer/models/Size.scala +++ b/server/app/com/xsn/explorer/models/values/Size.scala @@ -1,4 +1,4 @@ -package com.xsn.explorer.models +package com.xsn.explorer.models.values import com.alexitc.playsonify.models.WrappedInt import play.api.libs.json.{JsPath, Reads} diff --git a/server/test/com/xsn/explorer/helpers/DataGenerator.scala b/server/test/com/xsn/explorer/helpers/DataGenerator.scala index 6144b65..97b29b1 100644 --- a/server/test/com/xsn/explorer/helpers/DataGenerator.scala +++ b/server/test/com/xsn/explorer/helpers/DataGenerator.scala @@ -3,7 +3,7 @@ package com.xsn.explorer.helpers import com.xsn.explorer.models.persisted.Transaction import com.xsn.explorer.models.rpc.Block import com.xsn.explorer.models.values._ -import com.xsn.explorer.models.{Size, TransactionId} +import com.xsn.explorer.models.TransactionId trait DataGenerator { diff --git a/server/test/controllers/BlocksControllerSpec.scala b/server/test/controllers/BlocksControllerSpec.scala index 427e9b5..5ef5875 100644 --- a/server/test/controllers/BlocksControllerSpec.scala +++ b/server/test/controllers/BlocksControllerSpec.scala @@ -9,7 +9,7 @@ import com.xsn.explorer.helpers._ import com.xsn.explorer.models._ import com.xsn.explorer.models.fields.TransactionField import com.xsn.explorer.models.rpc.Block -import com.xsn.explorer.models.values.{Blockhash, Confirmations, Height} +import com.xsn.explorer.models.values.{Blockhash, Confirmations, Height, Size} import com.xsn.explorer.services.XSNService import controllers.common.MyAPISpec import org.scalactic.Good diff --git a/server/test/controllers/TransactionsControllerSpec.scala b/server/test/controllers/TransactionsControllerSpec.scala index ba70e8c..b30c938 100644 --- a/server/test/controllers/TransactionsControllerSpec.scala +++ b/server/test/controllers/TransactionsControllerSpec.scala @@ -7,7 +7,7 @@ import com.xsn.explorer.errors.TransactionNotFoundError import com.xsn.explorer.helpers.{DataHelper, DummyXSNService, TransactionDummyDataHandler, TransactionLoader} import com.xsn.explorer.models._ import com.xsn.explorer.models.rpc.Transaction -import com.xsn.explorer.models.values.Confirmations +import com.xsn.explorer.models.values.{Confirmations, Size} import com.xsn.explorer.services.XSNService import controllers.common.MyAPISpec import org.scalactic.{Bad, Good}