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 HexString model to the values package

master
Alexis Hernandez 6 years ago
parent
33fcda6ef3
commit
29b8b583ba
11 changed files with 14 additions and 15 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. 4
      server/app/com/xsn/explorer/models/persisted/Transaction.scala
  2. 3
      server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala
  3. 2
      server/app/com/xsn/explorer/models/values/HexString.scala
  4. 3
      server/app/com/xsn/explorer/services/TransactionRPCService.scala
  5. 2
      server/app/com/xsn/explorer/services/XSNService.scala
  6. 2
      server/test/com/xsn/explorer/data/TransactionPostgresDataHandlerSpec.scala
  7. 4
      server/test/com/xsn/explorer/helpers/DataGenerator.scala
  8. 2
      server/test/com/xsn/explorer/helpers/DummyXSNService.scala
  9. 3
      server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala
  10. 2
      server/test/com/xsn/explorer/models/values/HexStringSpec.scala
  11. 2
      server/test/controllers/AddressesControllerSpec.scala

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, Blockhash}
import com.xsn.explorer.models.{HexString, Size, TransactionId, rpc}
import com.xsn.explorer.models.values.{Address, Blockhash, HexString}
import com.xsn.explorer.models.{Size, TransactionId, rpc}
case class Transaction(
id: TransactionId,

3
server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala
View File

@ -1,7 +1,6 @@
package com.xsn.explorer.models.rpc
import com.xsn.explorer.models.HexString
import com.xsn.explorer.models.values.Address
import com.xsn.explorer.models.values.{Address, HexString}
import play.api.libs.functional.syntax._
import play.api.libs.json.{Reads, __}

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

@ -1,4 +1,4 @@
package com.xsn.explorer.models
package com.xsn.explorer.models.values
class HexString private (val string: String) extends AnyVal {

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

@ -5,7 +5,8 @@ import com.alexitc.playsonify.core.{FutureApplicationResult, FutureOr}
import com.xsn.explorer.errors.{InvalidRawTransactionError, TransactionFormatError, TransactionNotFoundError, XSNWorkQueueDepthExceeded}
import com.xsn.explorer.models.persisted.Transaction
import com.xsn.explorer.models.rpc.TransactionVIN
import com.xsn.explorer.models.{HexString, TransactionDetails, TransactionId, TransactionValue}
import com.xsn.explorer.models.values._
import com.xsn.explorer.models.{TransactionDetails, TransactionId, TransactionValue}
import com.xsn.explorer.util.Extensions.FutureOrExt
import javax.inject.Inject
import org.scalactic.{Bad, Good, One, Or}

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, Blockhash, Height}
import com.xsn.explorer.models.values.{Address, Blockhash, Height, HexString}
import javax.inject.Inject
import org.scalactic.{Bad, Good}
import org.slf4j.LoggerFactory

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

@ -12,7 +12,7 @@ import com.xsn.explorer.models._
import com.xsn.explorer.models.fields.TransactionField
import com.xsn.explorer.models.persisted.Transaction
import com.xsn.explorer.models.rpc.Block
import com.xsn.explorer.models.values.Height
import com.xsn.explorer.models.values.{Height, _}
import org.scalactic.{Good, One, Or}
import org.scalatest.BeforeAndAfter

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, Blockhash, Confirmations, Height}
import com.xsn.explorer.models.{HexString, Size, TransactionId}
import com.xsn.explorer.models.values._
import com.xsn.explorer.models.{Size, TransactionId}
trait DataGenerator {

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, Blockhash, Height}
import com.xsn.explorer.models.values.{Address, Blockhash, Height, HexString}
import com.xsn.explorer.services.XSNService
import play.api.libs.json.JsValue

3
server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala
View File

@ -1,7 +1,6 @@
package com.xsn.explorer.models.rpc
import com.xsn.explorer.models.HexString
import com.xsn.explorer.models.values._
import com.xsn.explorer.models.values.{HexString, _}
import org.scalatest.{MustMatchers, OptionValues, WordSpec}
class ScriptPubKeySpec extends WordSpec with MustMatchers with OptionValues {

2
server/test/com/xsn/explorer/models/HexStringSpec.scala → server/test/com/xsn/explorer/models/values/HexStringSpec.scala
View File

@ -1,4 +1,4 @@
package com.xsn.explorer.models
package com.xsn.explorer.models.values
import org.scalatest.{MustMatchers, OptionValues, WordSpec}

2
server/test/controllers/AddressesControllerSpec.scala
View File

@ -9,7 +9,7 @@ import com.xsn.explorer.helpers.{BalanceDummyDataHandler, DataHelper, Transactio
import com.xsn.explorer.models._
import com.xsn.explorer.models.fields.TransactionField
import com.xsn.explorer.models.persisted.{Balance, Transaction}
import com.xsn.explorer.models.values.Address
import com.xsn.explorer.models.values.{Address, _}
import com.xsn.explorer.util.Extensions.BigDecimalExt
import controllers.common.MyAPISpec
import org.scalactic.Good

Write Preview
Loading…
Cancel
Save