Browse Source

server: Move the Size value to the values package

master
Alexis Hernandez 6 years ago
parent
commit
6dd7b032b1
  1. 3
      server/app/com/xsn/explorer/data/anorm/parsers/CommonParsers.scala
  2. 2
      server/app/com/xsn/explorer/models/LightWalletTransaction.scala
  3. 2
      server/app/com/xsn/explorer/models/TransactionDetails.scala
  4. 2
      server/app/com/xsn/explorer/models/TransactionWithValues.scala
  5. 2
      server/app/com/xsn/explorer/models/persisted/Block.scala
  6. 4
      server/app/com/xsn/explorer/models/persisted/Transaction.scala
  7. 2
      server/app/com/xsn/explorer/models/rpc/Block.scala
  8. 2
      server/app/com/xsn/explorer/models/rpc/Transaction.scala
  9. 2
      server/app/com/xsn/explorer/models/values/Size.scala
  10. 2
      server/test/com/xsn/explorer/helpers/DataGenerator.scala
  11. 2
      server/test/controllers/BlocksControllerSpec.scala
  12. 2
      server/test/controllers/TransactionsControllerSpec.scala

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

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

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

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

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

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

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

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

2
server/app/com/xsn/explorer/models/Size.scala → 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}

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

2
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

2
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}

Loading…
Cancel
Save