crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fix CANCEL_ASSET_ORDER check for already closed, partially/fully matched, order.

Browse Source 
Additional unit tests to cover above case.
This commit is contained in:
catbref 2019-06-16 11:41:33 +01:00
parent aa141bb97f
commit 2e6d33659c
4 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qora/transaction/CancelAssetOrderTransaction.java
View File

@ -74,6 +74,9 @@ public class CancelAssetOrderTransaction extends Transaction {
if (orderData == null)
return ValidationResult.ORDER_DOES_NOT_EXIST;
if (orderData.getIsClosed())
return ValidationResult.ORDER_ALREADY_CLOSED;
Account creator = getCreator();
// Check creator's public key results in valid address

1
src/main/java/org/qora/transaction/Transaction.java
View File

@ -235,6 +235,7 @@ public abstract class Transaction {
MAXIMUM_PROXY_RELATIONSHIPS(84),
TRANSACTION_ALREADY_EXISTS(85),
NO_BLOCKCHAIN_LOCK(86),
ORDER_ALREADY_CLOSED(87),
NOT_YET_RELEASED(1000);
public final int value;

44
src/test/java/org/qora/test/assets/CancellingTests.java
View File

@ -1,5 +1,7 @@
package org.qora.test.assets;
import static org.junit.Assert.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map;
@ -7,12 +9,15 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.AccountUtils;
import org.qora.test.common.AssetUtils;
import org.qora.test.common.Common;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
public class CancellingTests extends Common {
@ -51,6 +56,31 @@ public class CancellingTests extends Common {
}
}
@Test
public void testRepeatCancel() throws DataException {
BigDecimal amount = new BigDecimal("1234.87654321").setScale(8);
BigDecimal price = new BigDecimal("1.35615263").setScale(8);
try (Repository repository = RepositoryManager.getRepository()) {
Map<String, Map<Long, BigDecimal>> initialBalances = AccountUtils.getBalances(repository, AssetUtils.testAssetId, AssetUtils.otherAssetId);
byte[] aliceOrderId = AssetUtils.createOrder(repository, "alice", AssetUtils.testAssetId, AssetUtils.otherAssetId, amount, price);
AssetUtils.cancelOrder(repository, "alice", aliceOrderId);
// Build 2nd cancel-order transaction to check it is invalid
assertCannotCancelClosedOrder(repository, "alice", aliceOrderId);
// Check asset balances match pre-ordering values
BigDecimal expectedBalance;
expectedBalance = initialBalances.get("alice").get(AssetUtils.testAssetId);
AccountUtils.assertBalance(repository, "alice", AssetUtils.testAssetId, expectedBalance);
expectedBalance = initialBalances.get("bob").get(AssetUtils.otherAssetId);
AccountUtils.assertBalance(repository, "bob", AssetUtils.otherAssetId, expectedBalance);
}
}
@Test
public void testPartialTargetMatchCancel() throws DataException {
BigDecimal aliceAmount = new BigDecimal("1234").setScale(8); // OTHER
@ -79,7 +109,7 @@ public class CancellingTests extends Common {
byte[] bobOrderId = AssetUtils.createOrder(repository, "bob", AssetUtils.otherAssetId, AssetUtils.testAssetId, bobAmount, bobPrice);
AssetUtils.cancelOrder(repository, "alice", aliceOrderId);
AssetUtils.cancelOrder(repository, "bob", bobOrderId);
assertCannotCancelClosedOrder(repository, "bob", bobOrderId);
// Check asset balances
BigDecimal expectedBalance;
@ -127,7 +157,7 @@ public class CancellingTests extends Common {
byte[] aliceOrderId = AssetUtils.createOrder(repository, "alice", AssetUtils.testAssetId, AssetUtils.otherAssetId, aliceAmount, alicePrice);
byte[] bobOrderId = AssetUtils.createOrder(repository, "bob", AssetUtils.otherAssetId, AssetUtils.testAssetId, bobAmount, bobPrice);
AssetUtils.cancelOrder(repository, "alice", aliceOrderId);
assertCannotCancelClosedOrder(repository, "alice", aliceOrderId);
AssetUtils.cancelOrder(repository, "bob", bobOrderId);
// Check asset balances
@ -177,7 +207,7 @@ public class CancellingTests extends Common {
byte[] bobOrderId = AssetUtils.createOrder(repository, "bob", AssetUtils.otherAssetId, AssetUtils.goldAssetId, bobAmount, bobPrice);
AssetUtils.cancelOrder(repository, "alice", aliceOrderId);
AssetUtils.cancelOrder(repository, "bob", bobOrderId);
assertCannotCancelClosedOrder(repository, "bob", bobOrderId);
// Check asset balances
BigDecimal expectedBalance;
@ -225,7 +255,7 @@ public class CancellingTests extends Common {
byte[] aliceOrderId = AssetUtils.createOrder(repository, "alice", AssetUtils.goldAssetId, AssetUtils.otherAssetId, aliceAmount, alicePrice);
byte[] bobOrderId = AssetUtils.createOrder(repository, "bob", AssetUtils.otherAssetId, AssetUtils.goldAssetId, bobAmount, bobPrice);
AssetUtils.cancelOrder(repository, "alice", aliceOrderId);
assertCannotCancelClosedOrder(repository, "alice", aliceOrderId);
AssetUtils.cancelOrder(repository, "bob", bobOrderId);
// Check asset balances
@ -247,4 +277,10 @@ public class CancellingTests extends Common {
}
}
public void assertCannotCancelClosedOrder(Repository repository, String accountName, byte[] orderId) throws DataException {
Transaction transaction = AssetUtils.buildCancelOrder(repository, accountName, orderId);
ValidationResult validationResult = transaction.isValidUnconfirmed();
assertEquals("CANCEL_ASSET_ORDER should be invalid due to already closed order", ValidationResult.ORDER_ALREADY_CLOSED, validationResult);
}
}

12
src/test/java/org/qora/test/common/AssetUtils.java
View File

@ -21,6 +21,7 @@ import org.qora.group.Group;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.Transaction;
public class AssetUtils {
@ -72,7 +73,7 @@ public class AssetUtils {
return repository.getAssetRepository().getAccountsOrders(account.getPublicKey(), null, null, null, null, true).get(0).getOrderId();
}
public static void cancelOrder(Repository repository, String accountName, byte[] orderId) throws DataException {
public static Transaction buildCancelOrder(Repository repository, String accountName, byte[] orderId) throws DataException {
PrivateKeyAccount account = Common.getTestAccount(repository, accountName);
byte[] reference = account.getLastReference();
@ -81,7 +82,14 @@ public class AssetUtils {
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, AssetUtils.txGroupId, reference, account.getPublicKey(), AssetUtils.fee, null);
TransactionData transactionData = new CancelAssetOrderTransactionData(baseTransactionData, orderId);
TransactionUtils.signAndForge(repository, transactionData, account);
return Transaction.fromData(repository, transactionData);
}
public static void cancelOrder(Repository repository, String accountName, byte[] orderId) throws DataException {
PrivateKeyAccount account = Common.getTestAccount(repository, accountName);
Transaction transaction = buildCancelOrder(repository, accountName, orderId);
TransactionUtils.signAndForge(repository, transaction.getTransactionData(), account);
}
public static void genericTradeTest(long haveAssetId, long wantAssetId,