fix-balances-0.15.5

wavesplatform · Mar 10, 2019 · 42cbdf5 · 42cbdf5
1 parent 44f81e6
commit 42cbdf5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/scala/com/wavesplatform/transaction/smart/WavesEnvironment.scala b/src/main/scala/com/wavesplatform/transaction/smart/WavesEnvironment.scala
@@ -68,8 +68,7 @@ class WavesEnvironment(nByte: Byte, in: Coeval[Transaction :+: Order :+: CNil],
       }
       address <- blockchain.resolveAlias(aoa)
       balance = blockchain.balance(address, maybeAssetId.map(ByteStr(_)))
-      safeBalance <- Either.cond(balance != 0L || blockchain.balance(address, None) == 0L, balance, "Balance of absent asset")
-    } yield safeBalance).left.map(_.toString)
+    } yield balance).left.map(_.toString)
   }
   override def transactionHeightById(id: Array[Byte]): Option[Long] =
     blockchain.transactionHeight(ByteStr(id)).map(_.toLong)

diff --git a/src/test/scala/com/wavesplatform/state/CommonSpec.scala b/src/test/scala/com/wavesplatform/state/CommonSpec.scala
@@ -25,7 +25,7 @@ class CommonSpec extends FreeSpec with Matchers with WithDomain with Transaction
       case (sender, initialBalance, assetId) =>
         withDomain() { d =>
           d.appendBlock(genesisBlock(nextTs, sender, initialBalance))
-//          d.portfolio(sender).balanceOf(Some(ByteStr(assetId))) shouldEqual 0L
+          d.portfolio(sender).balanceOf(Some(ByteStr(assetId))) shouldEqual 0L
         }
     }
   }