server: Move the IPAddress value to the values package

6 years ago · f67d7831f0
5 changed files with 5 additions and 5 deletions
--- a/server/app/com/xsn/explorer/models/values/IPAddress.scala
+++ b/server/app/com/xsn/explorer/models/values/IPAddress.scala
@ -1,4 +1,4 @@
-package com.xsn.explorer.models
+package com.xsn.explorer.models.values

 import com.alexitc.playsonify.models.WrappedString

--- a/server/app/com/xsn/explorer/services/MasternodeService.scala
+++ b/server/app/com/xsn/explorer/services/MasternodeService.scala
@ -6,9 +6,9 @@ import com.alexitc.playsonify.models.ordering.{FieldOrdering, OrderingCondition,
 import com.alexitc.playsonify.models.pagination.{Count, PaginatedQuery, PaginatedResult}
 import com.alexitc.playsonify.validators.PaginatedQueryValidator
 import com.xsn.explorer.errors.IPAddressFormatError
-import com.xsn.explorer.models.IPAddress
 import com.xsn.explorer.models.fields.MasternodeField
 import com.xsn.explorer.models.rpc.Masternode
+import com.xsn.explorer.models.values.IPAddress
 import com.xsn.explorer.parsers.MasternodeOrderingParser
 import javax.inject.Inject
 import org.scalactic.{Bad, Good}
--- 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, Blockhash, Height, HexString}
+import com.xsn.explorer.models.values._
 import javax.inject.Inject
 import org.scalactic.{Bad, Good}
 import org.slf4j.LoggerFactory
--- 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, Blockhash, Height, HexString}
+import com.xsn.explorer.models.values._
 import com.xsn.explorer.services.XSNService
 import play.api.libs.json.JsValue

--- a/server/test/controllers/MasternodesControllerSpec.scala
+++ b/server/test/controllers/MasternodesControllerSpec.scala
@ -6,7 +6,7 @@ import com.xsn.explorer.errors.MasternodeNotFoundError
 import com.xsn.explorer.helpers.DummyXSNService
 import com.xsn.explorer.models.rpc.Masternode
 import com.xsn.explorer.models.values._
-import com.xsn.explorer.models.{IPAddress, TransactionId}
+import com.xsn.explorer.models.TransactionId
 import com.xsn.explorer.services.XSNService
 import controllers.common.MyAPISpec
 import org.scalactic.{Bad, Good}