Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added "data" field to assets, added UPDATE_ASSET tx + fixes

Browse Source
This commit is contained in:
catbref
2019-03-13 14:06:52 +00:00
parent 8f72d9d423
commit d53777f461
21 changed files with 805 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/qora/test/TransactionTests.java
View File

@@ -605,9 +605,10 @@ public class TransactionTests extends Common {
boolean isDivisible = true;
BigDecimal fee = BigDecimal.ONE;
long timestamp = parentBlockData.getTimestamp() + 1_000;
String data = (timestamp >= BlockChain.getInstance().getQoraV2Timestamp()) ? "{}" : null;
IssueAssetTransactionData issueAssetTransactionData = new IssueAssetTransactionData(timestamp, Group.NO_GROUP, reference, sender.getPublicKey(),
sender.getAddress(), assetName, description, quantity, isDivisible, fee);
sender.getAddress(), assetName, description, quantity, isDivisible, data, fee);
Transaction issueAssetTransaction = new IssueAssetTransaction(repository, issueAssetTransactionData);
issueAssetTransaction.sign(sender);
@@ -989,11 +990,11 @@ public class TransactionTests extends Common {
// Check trade has correct values
BigDecimal expectedAmount = amount.divide(originalOrderData.getPrice()).setScale(8);
BigDecimal actualAmount = tradeData.getAmount();
BigDecimal actualAmount = tradeData.getTargetAmount();
assertTrue(expectedAmount.compareTo(actualAmount) == 0);
BigDecimal expectedPrice = amount;
BigDecimal actualPrice = tradeData.getPrice();
BigDecimal actualPrice = tradeData.getInitiatorAmount();
assertTrue(expectedPrice.compareTo(actualPrice) == 0);
// Check seller's "test asset" balance