Merge pull request #162 from wavesplatform/T412-allow-empty-strings-i…

…n-assetid-attachment

T412 Allow empty strings in asset ids and attachments

src/main/scala/scorex/api/http/assets/SignedTransferRequest.scala

@@ -34,10 +34,10 @@ case class SignedTransferRequest(@ApiModelProperty(value = "Base58 encoded sende
                                 signature: String) extends BroadcastRequest {
   def toTx: Either[ValidationError, TransferTransaction] = for {
     _sender <- PublicKeyAccount.fromBase58String(senderPublicKey)
-    _assetId <- parseBase58ToOption(assetId, "invalid.assetId", AssetIdStringLength)
-    _feeAssetId <- parseBase58ToOption(feeAssetId, "invalid.feeAssetId", AssetIdStringLength)
+    _assetId <- parseBase58ToOption(assetId.filter(_.length > 0), "invalid.assetId", AssetIdStringLength)
+    _feeAssetId <- parseBase58ToOption(feeAssetId.filter(_.length > 0), "invalid.feeAssetId", AssetIdStringLength)
     _signature <- parseBase58(signature, "invalid.signature", SignatureStringLength)
-    _attachment <- parseBase58(attachment, "invalid.attachment", TransferTransaction.MaxAttachmentStringSize)
+    _attachment <- parseBase58(attachment.filter(_.length > 0), "invalid.attachment", TransferTransaction.MaxAttachmentStringSize)
     _account <- if (Account.isValidAddress(recipient)) Right(new Account(recipient)) else Left(InvalidAddress)
     _t <- TransferTransaction.create(_assetId, _sender, _account, amount, timestamp, _feeAssetId, fee, _attachment,
       _signature)

src/test/scala/scorex/api/http/RequestGen.scala

@@ -29,14 +29,13 @@ trait RequestGen extends TransactionGen {
       .map(Base58.encode)
 
   val addressGen: G[String] = listOfN(32, Arbitrary.arbByte.arbitrary).map(b => Base58.encode(b.toArray))
-  val fee: G[Long] = choose(0, Long.MaxValue)
   val signatureGen: G[String] = listOfN(TypedTransaction.SignatureLength, Arbitrary.arbByte.arbitrary)
     .map(b => Base58.encode(b.toArray))
   private val assetIdStringGen = assetIdGen.map(_.map(Base58.encode))
 
   private val commonFields = for {
     _account <- addressGen
-    _fee <- fee
+    _fee <- smallFeeGen
   } yield (_account, _fee)
 
   val issueReq: G[IssueRequest] = for {

src/test/scala/scorex/api/http/assets/AssetsBroadcastRouteSpec.scala

@@ -2,7 +2,6 @@ package scorex.api.http.assets
 
 import com.typesafe.config.ConfigFactory
 import com.wavesplatform.http.ApiMarshallers._
-import akka.http.scaladsl.testkit._
 import com.wavesplatform.settings.RestAPISettings
 import org.scalacheck.Gen._
 import org.scalacheck.{Gen => G}
@@ -83,6 +82,13 @@ class AssetsBroadcastRouteSpec extends RouteSpec("/assets/broadcast/") with Requ
     "transfer transaction" in forAll(broadcastTransferReq) { tr =>
       def posting[A: Writes](v: A) = Post(routePath("transfer"), v) ~> route
 
+      posting(tr.copy(attachment = Some(""))) should produce(InvalidSignature)
+      posting(tr.copy(attachment = None)) should produce(InvalidSignature)
+      posting(tr.copy(assetId = Some(""))) should produce(InvalidSignature)
+      posting(tr.copy(assetId = None)) should produce(InvalidSignature)
+      posting(tr.copy(feeAssetId = Some(""))) should produce(InvalidSignature)
+      posting(tr.copy(feeAssetId = None)) should produce(InvalidSignature)
+
       forAll(nonPositiveLong) { q => posting(tr.copy(amount = q)) should produce (NegativeAmount) }
       forAll(invalidBase58) { pk => posting(tr.copy(senderPublicKey = pk)) should produce (InvalidAddress) }
       forAll(invalidBase58) { pk => posting(tr.copy(recipient = pk)) should produce (InvalidAddress) }