lukechilds
/
block-explorer
mirror of https://github.com/lukechilds/block-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

server: Move the Blockhash value to the values package

master
Alexis Hernandez 6 years ago
parent
a1737b9710
commit
de64af5b9b
32 changed files with 41 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      server/app/com/xsn/explorer/config/ExplorerConfig.scala
  2. 3
      server/app/com/xsn/explorer/data/BlockDataHandler.scala
  3. 2
      server/app/com/xsn/explorer/data/TransactionDataHandler.scala
  4. 3
      server/app/com/xsn/explorer/data/anorm/BlockPostgresDataHandler.scala
  5. 2
      server/app/com/xsn/explorer/data/anorm/TransactionPostgresDataHandler.scala
  6. 3
      server/app/com/xsn/explorer/data/anorm/dao/BlockPostgresDAO.scala
  7. 2
      server/app/com/xsn/explorer/data/anorm/dao/TransactionPostgresDAO.scala
  8. 1
      server/app/com/xsn/explorer/data/anorm/parsers/BlockParsers.scala
  9. 2
      server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala
  10. 3
      server/app/com/xsn/explorer/data/async/BlockFutureDataHandler.scala
  11. 2
      server/app/com/xsn/explorer/data/async/TransactionFutureDataHandler.scala
  12. 1
      server/app/com/xsn/explorer/models/LightWalletTransaction.scala
  13. 1
      server/app/com/xsn/explorer/models/TransactionDetails.scala
  14. 1
      server/app/com/xsn/explorer/models/TransactionWithValues.scala
  15. 1
      server/app/com/xsn/explorer/models/persisted/Block.scala
  16. 4
      server/app/com/xsn/explorer/models/persisted/Transaction.scala
  17. 1
      server/app/com/xsn/explorer/models/rpc/Block.scala
  18. 1
      server/app/com/xsn/explorer/models/rpc/Transaction.scala
  19. 2
      server/app/com/xsn/explorer/models/values/Blockhash.scala
  20. 1
      server/app/com/xsn/explorer/services/BlockService.scala
  21. 3
      server/app/com/xsn/explorer/services/LedgerSynchronizerService.scala
  22. 2
      server/app/com/xsn/explorer/services/XSNService.scala
  23. 2
      server/app/com/xsn/explorer/services/logic/BlockLogic.scala
  24. 2
      server/test/com/xsn/explorer/data/BlockPostgresDataHandlerSpec.scala
  25. 1
      server/test/com/xsn/explorer/helpers/BlockLoader.scala
  26. 4
      server/test/com/xsn/explorer/helpers/DataGenerator.scala
  27. 2
      server/test/com/xsn/explorer/helpers/DataHelper.scala
  28. 2
      server/test/com/xsn/explorer/helpers/DummyXSNService.scala
  29. 3
      server/test/com/xsn/explorer/helpers/FileBasedXSNService.scala
  30. 2
      server/test/com/xsn/explorer/helpers/TransactionDummyDataHandler.scala
  31. 3
      server/test/com/xsn/explorer/services/LedgerSynchronizerServiceSpec.scala
  32. 1
      server/test/controllers/BlocksControllerSpec.scala

2
server/app/com/xsn/explorer/config/ExplorerConfig.scala
View File

@ -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

3
server/app/com/xsn/explorer/data/BlockDataHandler.scala
View File

@ -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

2
server/app/com/xsn/explorer/data/TransactionDataHandler.scala
View File

@ -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

3
server/app/com/xsn/explorer/data/anorm/BlockPostgresDataHandler.scala
View File

@ -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

2
server/app/com/xsn/explorer/data/anorm/TransactionPostgresDataHandler.scala
View File

@ -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

3
server/app/com/xsn/explorer/data/anorm/dao/BlockPostgresDAO.scala
View File

@ -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) {

2
server/app/com/xsn/explorer/data/anorm/dao/TransactionPostgresDAO.scala
View File

@ -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

1
server/app/com/xsn/explorer/data/anorm/parsers/BlockParsers.scala
View File

@ -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 {

2
server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala
View File

@ -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 {

3
server/app/com/xsn/explorer/data/async/BlockFutureDataHandler.scala
View File

@ -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

2
server/app/com/xsn/explorer/data/async/TransactionFutureDataHandler.scala
View File

@ -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

1
server/app/com/xsn/explorer/models/LightWalletTransaction.scala
View File

@ -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(

1
server/app/com/xsn/explorer/models/TransactionDetails.scala
View File

@ -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(

1
server/app/com/xsn/explorer/models/TransactionWithValues.scala
View File

@ -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(

1
server/app/com/xsn/explorer/models/persisted/Block.scala
View File

@ -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(

4
server/app/com/xsn/explorer/models/persisted/Transaction.scala
View File

@ -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,

1
server/app/com/xsn/explorer/models/rpc/Block.scala
View File

@ -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._

1
server/app/com/xsn/explorer/models/rpc/Transaction.scala
View File

@ -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._

2
server/app/com/xsn/explorer/models/Blockhash.scala → server/app/com/xsn/explorer/models/values/Blockhash.scala
View File

@ -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._

1
server/app/com/xsn/explorer/services/BlockService.scala
View File

@ -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

3
server/app/com/xsn/explorer/services/LedgerSynchronizerService.scala
View File

@ -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

2
server/app/com/xsn/explorer/services/XSNService.scala
View File

@ -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

2
server/app/com/xsn/explorer/services/logic/BlockLogic.scala
View File

@ -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 {

2
server/test/com/xsn/explorer/data/BlockPostgresDataHandlerSpec.scala
View File

@ -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

1
server/test/com/xsn/explorer/helpers/BlockLoader.scala
View File

@ -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 {

4
server/test/com/xsn/explorer/helpers/DataGenerator.scala
View File

@ -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 {

2
server/test/com/xsn/explorer/helpers/DataHelper.scala
View File

@ -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 {

2
server/test/com/xsn/explorer/helpers/DummyXSNService.scala
View File

@ -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

3
server/test/com/xsn/explorer/helpers/FileBasedXSNService.scala
View File

@ -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

2
server/test/com/xsn/explorer/helpers/TransactionDummyDataHandler.scala
View File

@ -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 {

3
server/test/com/xsn/explorer/services/LedgerSynchronizerServiceSpec.scala
View File

@ -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

1
server/test/controllers/BlocksControllerSpec.scala
View File

@ -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

Write Preview
Loading…
Cancel
Save