server: Move the Blockhash value to the values package

wiringbits · Feb 17, 2019 · de64af5 · de64af5
1 parent a1737b9
commit de64af5
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 24 deletions.
diff --git a/server/app/com/xsn/explorer/config/ExplorerConfig.scala b/server/app/com/xsn/explorer/config/ExplorerConfig.scala
@@ -1,6 +1,6 @@
 package com.xsn.explorer.config
 
-import com.xsn.explorer.models.Blockhash
+import com.xsn.explorer.models.values.Blockhash
 import javax.inject.Inject
 import play.api.Configuration
 

diff --git a/server/app/com/xsn/explorer/data/BlockDataHandler.scala b/server/app/com/xsn/explorer/data/BlockDataHandler.scala
@@ -5,7 +5,8 @@ import com.alexitc.playsonify.models.ordering.FieldOrdering
 import com.alexitc.playsonify.models.pagination.{PaginatedQuery, PaginatedResult}
 import com.xsn.explorer.models.fields.BlockField
 import com.xsn.explorer.models.persisted.Block
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 
 import scala.language.higherKinds
 

diff --git a/server/app/com/xsn/explorer/data/TransactionDataHandler.scala b/server/app/com/xsn/explorer/data/TransactionDataHandler.scala
@@ -6,7 +6,7 @@ import com.alexitc.playsonify.models.pagination.{Limit, PaginatedQuery, Paginate
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 
 import scala.language.higherKinds
 

diff --git a/server/app/com/xsn/explorer/data/anorm/BlockPostgresDataHandler.scala b/server/app/com/xsn/explorer/data/anorm/BlockPostgresDataHandler.scala
@@ -8,7 +8,8 @@ import com.xsn.explorer.data.anorm.dao.BlockPostgresDAO
 import com.xsn.explorer.errors._
 import com.xsn.explorer.models.fields.BlockField
 import com.xsn.explorer.models.persisted.Block
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 import javax.inject.Inject
 import org.scalactic.{Good, One, Or}
 import play.api.db.Database

diff --git a/server/app/com/xsn/explorer/data/anorm/TransactionPostgresDataHandler.scala b/server/app/com/xsn/explorer/data/anorm/TransactionPostgresDataHandler.scala
@@ -8,7 +8,7 @@ import com.xsn.explorer.data.anorm.dao.{TransactionOutputPostgresDAO, Transactio
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import javax.inject.Inject
 import org.scalactic.Good
 import play.api.db.Database

diff --git a/server/app/com/xsn/explorer/data/anorm/dao/BlockPostgresDAO.scala b/server/app/com/xsn/explorer/data/anorm/dao/BlockPostgresDAO.scala
@@ -9,7 +9,8 @@ import com.alexitc.playsonify.sql.FieldOrderingSQLInterpreter
 import com.xsn.explorer.data.anorm.parsers.BlockParsers._
 import com.xsn.explorer.models.fields.BlockField
 import com.xsn.explorer.models.persisted.Block
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 import javax.inject.Inject
 
 class BlockPostgresDAO @Inject() (fieldOrderingSQLInterpreter: FieldOrderingSQLInterpreter) {

diff --git a/server/app/com/xsn/explorer/data/anorm/dao/TransactionPostgresDAO.scala b/server/app/com/xsn/explorer/data/anorm/dao/TransactionPostgresDAO.scala
@@ -10,7 +10,7 @@ import com.xsn.explorer.data.anorm.parsers.TransactionParsers._
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import javax.inject.Inject
 import org.slf4j.LoggerFactory
 

diff --git a/server/app/com/xsn/explorer/data/anorm/parsers/BlockParsers.scala b/server/app/com/xsn/explorer/data/anorm/parsers/BlockParsers.scala
@@ -4,6 +4,7 @@ import anorm.SqlParser._
 import anorm._
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.persisted.Block
+import com.xsn.explorer.models.values._
 
 object BlockParsers {
 

diff --git a/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala b/server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala
@@ -2,7 +2,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.{Blockhash, Size}
+import com.xsn.explorer.models.Size
 
 object CommonParsers {
 

diff --git a/server/app/com/xsn/explorer/data/async/BlockFutureDataHandler.scala b/server/app/com/xsn/explorer/data/async/BlockFutureDataHandler.scala
@@ -7,7 +7,8 @@ import com.xsn.explorer.data.{BlockBlockingDataHandler, BlockDataHandler}
 import com.xsn.explorer.executors.DatabaseExecutionContext
 import com.xsn.explorer.models.fields.BlockField
 import com.xsn.explorer.models.persisted.Block
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 import javax.inject.Inject
 
 import scala.concurrent.Future

diff --git a/server/app/com/xsn/explorer/data/async/TransactionFutureDataHandler.scala b/server/app/com/xsn/explorer/data/async/TransactionFutureDataHandler.scala
@@ -8,7 +8,7 @@ import com.xsn.explorer.executors.DatabaseExecutionContext
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import javax.inject.Inject
 
 import scala.concurrent.Future

diff --git a/server/app/com/xsn/explorer/models/LightWalletTransaction.scala b/server/app/com/xsn/explorer/models/LightWalletTransaction.scala
@@ -1,5 +1,6 @@
 package com.xsn.explorer.models
 
+import com.xsn.explorer.models.values.Blockhash
 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
@@ -1,5 +1,6 @@
 package com.xsn.explorer.models
 
+import com.xsn.explorer.models.values.Blockhash
 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
@@ -1,5 +1,6 @@
 package com.xsn.explorer.models
 
+import com.xsn.explorer.models.values.Blockhash
 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
@@ -1,6 +1,7 @@
 package com.xsn.explorer.models.persisted
 
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.values.Blockhash
 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
@@ -1,7 +1,7 @@
 package com.xsn.explorer.models.persisted
 
-import com.xsn.explorer.models.values.Address
-import com.xsn.explorer.models.{Blockhash, HexString, Size, TransactionId, rpc}
+import com.xsn.explorer.models.values.{Address, Blockhash}
+import com.xsn.explorer.models.{HexString, Size, 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
@@ -1,6 +1,7 @@
 package com.xsn.explorer.models.rpc
 
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.values.Blockhash
 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
@@ -1,6 +1,7 @@
 package com.xsn.explorer.models.rpc
 
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.values.Blockhash
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 

diff --git a/...p/com/xsn/explorer/models/Blockhash.scala → ...sn/explorer/models/values/Blockhash.scala b/...p/com/xsn/explorer/models/Blockhash.scala → ...sn/explorer/models/values/Blockhash.scala
@@ -1,4 +1,4 @@
-package com.xsn.explorer.models
+package com.xsn.explorer.models.values
 
 import com.alexitc.playsonify.models.WrappedString
 import play.api.libs.json._

diff --git a/server/app/com/xsn/explorer/services/BlockService.scala b/server/app/com/xsn/explorer/services/BlockService.scala
@@ -5,6 +5,7 @@ import com.alexitc.playsonify.core.FutureOr.Implicits.{FutureOps, OrOps}
 import com.xsn.explorer.errors.BlockRewardsNotFoundError
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.rpc.{Block, TransactionVIN}
+import com.xsn.explorer.models.values.Blockhash
 import com.xsn.explorer.services.logic.{BlockLogic, TransactionLogic}
 import com.xsn.explorer.util.Extensions.FutureOrExt
 import javax.inject.Inject

diff --git a/server/app/com/xsn/explorer/services/LedgerSynchronizerService.scala b/server/app/com/xsn/explorer/services/LedgerSynchronizerService.scala
@@ -6,7 +6,8 @@ import com.xsn.explorer.data.async.{BlockFutureDataHandler, LedgerFutureDataHand
 import com.xsn.explorer.errors.BlockNotFoundError
 import com.xsn.explorer.models.persisted.{Block, Transaction}
 import com.xsn.explorer.models.transformers._
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 import com.xsn.explorer.util.Extensions.FutureOrExt
 import javax.inject.Inject
 import org.scalactic.Good

diff --git a/server/app/com/xsn/explorer/services/XSNService.scala b/server/app/com/xsn/explorer/services/XSNService.scala
@@ -7,7 +7,7 @@ import com.xsn.explorer.config.{ExplorerConfig, RPCConfig}
 import com.xsn.explorer.errors._
 import com.xsn.explorer.executors.ExternalServiceExecutionContext
 import com.xsn.explorer.models._
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import javax.inject.Inject
 import org.scalactic.{Bad, Good}
 import org.slf4j.LoggerFactory

diff --git a/server/app/com/xsn/explorer/services/logic/BlockLogic.scala b/server/app/com/xsn/explorer/services/logic/BlockLogic.scala
@@ -4,7 +4,7 @@ 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, Transaction}
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import org.scalactic.{Bad, Good, One, Or}
 
 class BlockLogic {

diff --git a/server/test/com/xsn/explorer/data/BlockPostgresDataHandlerSpec.scala b/server/test/com/xsn/explorer/data/BlockPostgresDataHandlerSpec.scala
@@ -8,9 +8,9 @@ import com.xsn.explorer.data.anorm.dao.BlockPostgresDAO
 import com.xsn.explorer.data.common.PostgresDataHandlerSpec
 import com.xsn.explorer.errors.BlockNotFoundError
 import com.xsn.explorer.helpers.BlockLoader
-import com.xsn.explorer.models.Blockhash
 import com.xsn.explorer.models.fields.BlockField
 import com.xsn.explorer.models.persisted.Block
+import com.xsn.explorer.models.values.Blockhash
 import org.scalactic.{Bad, One, Or}
 import org.scalatest.BeforeAndAfter
 

diff --git a/server/test/com/xsn/explorer/helpers/BlockLoader.scala b/server/test/com/xsn/explorer/helpers/BlockLoader.scala
@@ -3,6 +3,7 @@ package com.xsn.explorer.helpers
 import java.io.File
 
 import com.xsn.explorer.models._
+import com.xsn.explorer.models.values.Blockhash
 import play.api.libs.json.{JsValue, Json}
 
 object BlockLoader {

diff --git a/server/test/com/xsn/explorer/helpers/DataGenerator.scala b/server/test/com/xsn/explorer/helpers/DataGenerator.scala
@@ -2,8 +2,8 @@ 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.Address
-import com.xsn.explorer.models.{Blockhash, Confirmations, Height, HexString, Size, TransactionId}
+import com.xsn.explorer.models.values.{Address, Blockhash}
+import com.xsn.explorer.models.{Confirmations, Height, HexString, Size, TransactionId}
 
 trait DataGenerator {
 

diff --git a/server/test/com/xsn/explorer/helpers/DataHelper.scala b/server/test/com/xsn/explorer/helpers/DataHelper.scala
@@ -1,7 +1,7 @@
 package com.xsn.explorer.helpers
 
 import com.xsn.explorer.models.values._
-import com.xsn.explorer.models.{Blockhash, TransactionId}
+import com.xsn.explorer.models.TransactionId
 
 object DataHelper {
 

diff --git a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
@@ -3,7 +3,7 @@ package com.xsn.explorer.helpers
 import com.alexitc.playsonify.core.FutureApplicationResult
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.rpc.Masternode
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 import com.xsn.explorer.services.XSNService
 import play.api.libs.json.JsValue
 

diff --git a/server/test/com/xsn/explorer/helpers/FileBasedXSNService.scala b/server/test/com/xsn/explorer/helpers/FileBasedXSNService.scala
@@ -3,7 +3,8 @@ package com.xsn.explorer.helpers
 import com.alexitc.playsonify.core.FutureApplicationResult
 import com.xsn.explorer.errors.{BlockNotFoundError, TransactionNotFoundError}
 import com.xsn.explorer.models.rpc.{Block, Transaction}
-import com.xsn.explorer.models.{Blockhash, Height, TransactionId}
+import com.xsn.explorer.models.values.Blockhash
+import com.xsn.explorer.models.{Height, TransactionId}
 import org.scalactic.{Good, One, Or}
 import play.api.libs.json.JsValue
 

diff --git a/server/test/com/xsn/explorer/helpers/TransactionDummyDataHandler.scala b/server/test/com/xsn/explorer/helpers/TransactionDummyDataHandler.scala
@@ -8,7 +8,7 @@ import com.xsn.explorer.data.TransactionBlockingDataHandler
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, Blockhash}
 
 class TransactionDummyDataHandler extends TransactionBlockingDataHandler {
 

diff --git a/server/test/com/xsn/explorer/services/LedgerSynchronizerServiceSpec.scala b/server/test/com/xsn/explorer/services/LedgerSynchronizerServiceSpec.scala
@@ -9,7 +9,8 @@ import com.xsn.explorer.helpers.DataHandlerObjects._
 import com.xsn.explorer.helpers.LedgerHelper._
 import com.xsn.explorer.helpers._
 import com.xsn.explorer.models.rpc.Block
-import com.xsn.explorer.models.{Blockhash, Height}
+import com.xsn.explorer.models.Height
+import com.xsn.explorer.models.values.Blockhash
 import com.xsn.explorer.parsers.TransactionOrderingParser
 import org.scalactic.{Bad, Good, One, Or}
 import org.scalatest.BeforeAndAfter

diff --git a/server/test/controllers/BlocksControllerSpec.scala b/server/test/controllers/BlocksControllerSpec.scala
@@ -9,6 +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
 import com.xsn.explorer.services.XSNService
 import controllers.common.MyAPISpec
 import org.scalactic.Good