Fix distribution method

wavesplatform · Dec 18, 2018 · 1a6a0e5 · 1a6a0e5
1 parent 66df0f8
commit 1a6a0e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/it/src/test/scala/com/wavesplatform/it/sync/AssetDistributionSuite.scala b/it/src/test/scala/com/wavesplatform/it/sync/AssetDistributionSuite.scala
@@ -67,10 +67,13 @@ class AssetDistributionSuite extends BaseTransactionSuite with CancelAfterFailur
         waitForTx = true
       )
 
+    nodes.waitForHeightArise()
+
     val distribution = node.assetDistribution(issueTx, None, None, None)
 
     distribution.size shouldBe (recievers.size + 1)
     distribution(issuer.address) shouldBe (issueAmount - 10 * recievers.length)
+
     assert(recievers.forall(rc => distribution(rc.address) == 10), "Distribution correct")
   }
 

diff --git a/src/main/scala/com/wavesplatform/database/LevelDBWriter.scala b/src/main/scala/com/wavesplatform/database/LevelDBWriter.scala
@@ -751,7 +751,11 @@ class LevelDBWriter(writableDB: DB, fs: FunctionalitySettings, val maxCacheSize:
     (for {
       seqNr     <- (1 to db.get(Keys.addressesForAssetSeqNr(assetId))).par
       addressId <- db.get(Keys.addressesForAsset(assetId, seqNr)).par
-      balance = db.get(Keys.assetBalance(addressId, assetId)(height))
+      actualHeight <- db
+        .get(Keys.assetBalanceHistory(addressId, assetId))
+        .filterNot(_ > height)
+        .headOption
+      balance = db.get(Keys.assetBalance(addressId, assetId)(actualHeight))
       if balance > 0
     } yield db.get(Keys.idToAddress(addressId)) -> balance).toMap.seq
   }