Massive refactor to change 'qora' references to 'qortal'.

Blockchain configs will need "v2Timestamp" feature trigger renaming to "qortalTimestamp"!

Due to Controller.VERSION_PREFIX changing, peer-to-peer protocol version detection has
been changed. Was previous a substring match, now we test peers's buildTimestamp is at
least Peer.V2_PROTOCOL_TIMESTAMP_THRESHOLD. Changes in Peer.java.

Also added comment and throw() to QortalATAPI.getNextTransactionTimestamp()
as this needs given the change to Qortal's block timestamps from legacy Qora.

Changes to HSQLDB data types, e.g. QoraAddress to QortalAddress, means existing
database will need to be thrown away after this commit!
This commit is contained in:
catbref
2020-02-04 12:11:37 +00:00
parent 87dffb183e
commit e0e9673837
428 changed files with 3175 additions and 3011 deletions

View File

@@ -1,4 +1,4 @@
package org.qora.test;
package org.qortal.test;
import static org.junit.Assert.*;
@@ -13,24 +13,24 @@ import java.util.stream.Collectors;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.account.AccountData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.AccountRepository.BalanceOrdering;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TestAccount;
import org.qora.test.common.TransactionUtils;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.block.BlockChain;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.account.AccountData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils;
public class AccountBalanceTests extends Common {

View File

@@ -1,29 +1,29 @@
package org.qora.test;
package org.qortal.test;
import java.math.BigDecimal;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.Block;
import org.qora.block.GenesisBlock;
import org.qora.data.at.ATStateData;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TransactionUtils;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
import org.qora.transform.block.BlockTransformer;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.utils.Base58;
import org.qora.utils.Triple;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.Block;
import org.qortal.block.GenesisBlock;
import org.qortal.data.at.ATStateData;
import org.qortal.data.block.BlockData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transform.TransformationException;
import org.qortal.transform.block.BlockTransformer;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import org.qortal.utils.Triple;
import static org.junit.Assert.*;

View File

@@ -1,4 +1,4 @@
package org.qora.test;
package org.qortal.test;
import static org.junit.Assert.*;
@@ -10,7 +10,7 @@ import java.util.Random;
import org.junit.Before;
import org.junit.Test;
import org.qora.utils.ByteArray;
import org.qortal.utils.ByteArray;
public class ByteArrayTests {

View File

@@ -1,4 +1,4 @@
package org.qora.test;
package org.qortal.test;
import static org.junit.Assert.*;
@@ -7,16 +7,16 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.qora.account.Account;
import org.qora.block.Block;
import org.qora.data.block.BlockSummaryData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.Common;
import org.qora.test.common.TestAccount;
import org.qora.transform.Transformer;
import org.qora.transform.block.BlockTransformer;
import org.qortal.account.Account;
import org.qortal.block.Block;
import org.qortal.data.block.BlockSummaryData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import org.qortal.transform.Transformer;
import org.qortal.transform.block.BlockTransformer;
import org.junit.Before;
import org.junit.Test;

View File

@@ -1,15 +1,15 @@
package org.qora.test;
package org.qortal.test;
import org.junit.Test;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.test.common.Common;
import org.qora.transaction.CreateAssetOrderTransaction;
import org.qora.transaction.CreatePollTransaction;
import org.qora.transaction.IssueAssetTransaction;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.utils.NTP;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
import org.qortal.transaction.CreateAssetOrderTransaction;
import org.qortal.transaction.CreatePollTransaction;
import org.qortal.transaction.IssueAssetTransaction;
import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.NTP;
import static org.junit.Assert.*;

View File

@@ -1,11 +1,11 @@
package org.qora.test;
package org.qortal.test;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.BlockChain;
import org.qora.crypto.BouncyCastle25519;
import org.qora.crypto.Crypto;
import org.qora.test.common.Common;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.crypto.BouncyCastle25519;
import org.qortal.crypto.Crypto;
import org.qortal.test.common.Common;
import static org.junit.Assert.*;
@@ -97,7 +97,7 @@ public class CryptoTests extends Common {
String expected58 = publicKey58;
String actual58 = Base58.encode(account.getPublicKey());
assertEquals("qora-core derived public key incorrect", expected58, actual58);
assertEquals("qortal derived public key incorrect", expected58, actual58);
Ed25519PrivateKeyParameters privateKeyParams = new Ed25519PrivateKeyParameters(privateKey, 0);
Ed25519PublicKeyParameters publicKeyParams = privateKeyParams.generatePublicKey();

View File

@@ -1,4 +1,4 @@
package org.qora.test;
package org.qortal.test;
import java.util.ArrayList;
import java.util.Collections;
@@ -10,7 +10,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.qora.utils.ExecuteProduceConsume;
import org.qortal.utils.ExecuteProduceConsume;
public class EPCTests {

View File

@@ -1,10 +1,10 @@
package org.qora.test;
package org.qortal.test;
import java.awt.TrayIcon.MessageType;
import org.junit.Test;
import org.qora.gui.SplashFrame;
import org.qora.gui.SysTray;
import org.qortal.gui.SplashFrame;
import org.qortal.gui.SysTray;
public class GuiTests {

View File

@@ -1,7 +1,7 @@
package org.qora.test;
package org.qortal.test;
import org.junit.Test;
import org.qora.crypto.MemoryPoW;
import org.qortal.crypto.MemoryPoW;
import static org.junit.Assert.*;

View File

@@ -1,15 +1,15 @@
package org.qora.test;
package org.qortal.test;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.Account;
import org.qora.asset.Asset;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepository;
import org.qora.test.common.BlockUtils;
import org.qora.test.common.Common;
import org.qortal.account.Account;
import org.qortal.asset.Asset;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.hsqldb.HSQLDBRepository;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import static org.junit.Assert.*;

View File

@@ -1,17 +1,17 @@
package org.qora.test;
package org.qortal.test;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.Common;
import org.qora.test.common.TransactionUtils;
import org.qora.transaction.Transaction;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.transaction.Transaction;
import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.Base58;
import com.google.common.hash.HashCode;

View File

@@ -1,24 +1,24 @@
package org.qora.test;
package org.qortal.test;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.BlockChain;
import org.qora.block.BlockMinter;
import org.qora.data.account.AccountData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.TransferPrivsTransactionData;
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.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TestAccount;
import org.qora.test.common.TransactionUtils;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter;
import org.qortal.data.account.AccountData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferPrivsTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils;
import static org.junit.Assert.*;

View File

@@ -1,4 +1,4 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
@@ -6,8 +6,8 @@ import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.resource.AddressesResource;
import org.qora.test.common.ApiCommon;
import org.qortal.api.resource.AddressesResource;
import org.qortal.test.common.ApiCommon;
public class AddressesApiTests extends ApiCommon {

View File

@@ -1,11 +1,11 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.resource.AdminResource;
import org.qora.test.common.ApiCommon;
import org.qortal.api.resource.AdminResource;
import org.qortal.test.common.ApiCommon;
public class AdminApiTests extends ApiCommon {

View File

@@ -1,4 +1,4 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
@@ -8,12 +8,12 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.ApiError;
import org.qora.api.ApiException;
import org.qora.api.resource.AssetsResource;
import org.qora.api.resource.TransactionsResource.ConfirmationStatus;
import org.qora.repository.AccountRepository.BalanceOrdering;
import org.qora.test.common.ApiCommon;
import org.qortal.api.ApiError;
import org.qortal.api.ApiException;
import org.qortal.api.resource.AssetsResource;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.test.common.ApiCommon;
public class AssetsApiTests extends ApiCommon {

View File

@@ -1,4 +1,4 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
@@ -8,8 +8,8 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.resource.BlocksResource;
import org.qora.test.common.ApiCommon;
import org.qortal.api.resource.BlocksResource;
import org.qortal.test.common.ApiCommon;
public class BlockApiTests extends ApiCommon {

View File

@@ -1,11 +1,11 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.resource.GroupsResource;
import org.qora.test.common.ApiCommon;
import org.qortal.api.resource.GroupsResource;
import org.qortal.test.common.ApiCommon;
public class GroupApiTests extends ApiCommon {

View File

@@ -1,4 +1,4 @@
package org.qora.test.api;
package org.qortal.test.api;
import static org.junit.Assert.*;
@@ -7,10 +7,10 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.qora.api.resource.TransactionsResource;
import org.qora.api.resource.TransactionsResource.ConfirmationStatus;
import org.qora.test.common.ApiCommon;
import org.qora.transaction.Transaction.TransactionType;
import org.qortal.api.resource.TransactionsResource;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
import org.qortal.test.common.ApiCommon;
import org.qortal.transaction.Transaction.TransactionType;
public class TransactionsApiTests extends ApiCommon {

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.File;
import java.net.UnknownHostException;
@@ -36,20 +36,20 @@ import com.google.common.hash.HashCode;
import com.google.common.primitives.Bytes;
/**
* Initiator must be Qora-chain so that initiator can send initial message to BTC P2SH then Qora can scan for P2SH add send corresponding message to Qora AT.
* Initiator must be Qortal-chain so that initiator can send initial message to BTC P2SH then Qortal can scan for P2SH add send corresponding message to Qortal AT.
*
* Initiator (wants Qora, has BTC)
* Initiator (wants QORT, has BTC)
* Funds BTC P2SH address
*
* Responder (has Qora, wants BTC)
* Builds Qora ACCT AT and funds it with Qora
* Responder (has QORT, wants BTC)
* Builds Qortal ACCT AT and funds it with QORT
*
* Initiator sends recipient+secret+script as input to BTC P2SH address, releasing BTC amount - fees to responder
*
* Qora nodes scan for P2SH output, checks amount and recipient and if ok sends secret to Qora ACCT AT
* (Or it's possible to feed BTC transaction details into Qora AT so it can check them itself?)
* Qortal nodes scan for P2SH output, checks amount and recipient and if ok sends secret to Qortal ACCT AT
* (Or it's possible to feed BTC transaction details into Qortal AT so it can check them itself?)
*
* Qora ACCT AT sends its Qora to initiator
* Qortal ACCT AT sends its QORT to initiator
*
*/

View File

@@ -1,21 +1,21 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.security.Security;
import org.bitcoinj.core.Base58;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qora.block.BlockChain;
import org.qora.controller.Controller;
import org.qora.data.account.RewardShareData;
import org.qora.gui.Gui;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.settings.Settings;
import org.qora.transform.block.BlockTransformer;
import org.qortal.block.BlockChain;
import org.qortal.controller.Controller;
import org.qortal.data.account.RewardShareData;
import org.qortal.gui.Gui;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryFactory;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qortal.settings.Settings;
import org.qortal.transform.block.BlockTransformer;
import org.roaringbitmap.IntIterator;
import io.druid.extendedset.intset.ConciseSet;

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.IOException;
import java.net.InetAddress;

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.IOException;
import java.io.InputStream;
@@ -21,8 +21,7 @@ public class ProxyTest {
private static final Pattern proxyUrlPattern = Pattern.compile("(https://)([^@:/]+)@([0-9.]{7,15})(/.*)");
public static void main(String args[]) {
String uri = "https://raw.githubusercontent.com@151.101.16.133/catbref/qora-core/894f0e54a6c22e68d4f4162b2ebcdf9b4e39162a/qora-core.jar";
// String uri = "https://raw.githubusercontent.com/catbref/qora-core/894f0e54a6c22e68d4f4162b2ebcdf9b4e39162a/qora-core.jar";
String uri = "https://raw.githubusercontent.com@151.101.16.133/QORT/qortal/master/pom.xml";
try (InputStream in = fetchStream(uri)) {
int byteCount = 0;

View File

@@ -1,12 +1,12 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.security.Security;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.utils.Base58;
public class RewardShareKeys {

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.FileReader;
import java.io.IOException;
@@ -11,9 +11,9 @@ import javax.xml.transform.stream.StreamSource;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.qora.block.BlockChain;
import org.qora.data.transaction.TransactionData;
import org.qora.settings.Settings;
import org.qortal.block.BlockChain;
import org.qortal.data.transaction.TransactionData;
import org.qortal.settings.Settings;
public class SettingsTests {

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.IOException;
import java.io.InputStream;

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.security.SecureRandom;
import java.security.Security;
@@ -8,10 +8,10 @@ import java.util.concurrent.Executors;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.qora.account.PrivateKeyAccount;
import org.qora.crypto.Crypto;
import org.qora.utils.BIP39;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.crypto.Crypto;
import org.qortal.utils.BIP39;
import org.qortal.utils.Base58;
import com.google.common.primitives.Bytes;

View File

@@ -1,4 +1,4 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.io.IOException;
import java.io.InputStream;

View File

@@ -1,5 +1,5 @@
package org.qora.test.apps;
import org.qora.crypto.BrokenMD160;
package org.qortal.test.apps;
import org.qortal.crypto.BrokenMD160;
import com.google.common.hash.HashCode;

View File

@@ -1,14 +1,14 @@
package org.qora.test.apps;
package org.qortal.test.apps;
import java.security.Security;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.qora.block.BlockChain;
import org.qora.controller.Controller;
import org.qora.repository.DataException;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.settings.Settings;
import org.qortal.block.BlockChain;
import org.qortal.controller.Controller;
import org.qortal.repository.DataException;
import org.qortal.repository.RepositoryFactory;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qortal.settings.Settings;
public class orphan {

View File

@@ -1,4 +1,4 @@
package org.qora.test.assets;
package org.qortal.test.assets;
import static org.junit.Assert.*;
@@ -9,15 +9,14 @@ 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;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.AssetUtils;
import org.qortal.test.common.Common;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
public class CancellingTests extends Common {

View File

@@ -1,4 +1,4 @@
package org.qora.test.assets;
package org.qortal.test.assets;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -6,9 +6,9 @@ import java.math.RoundingMode;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.asset.Order;
import org.qora.repository.DataException;
import org.qora.test.common.Common;
import org.qortal.asset.Order;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
public class GranularityTests extends Common {

View File

@@ -1,9 +1,9 @@
package org.qora.test.assets;
package org.qortal.test.assets;
import org.junit.After;
import org.junit.Before;
import org.qora.repository.DataException;
import org.qora.test.common.Common;
import org.qortal.repository.DataException;
import org.qortal.test.common.Common;
public class MixedPricingTests extends Common{

View File

@@ -1,16 +1,15 @@
package org.qora.test.assets;
package org.qortal.test.assets;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.data.asset.OrderData;
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.qortal.data.asset.OrderData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.AssetUtils;
import org.qortal.test.common.Common;
import java.math.BigDecimal;
import java.math.RoundingMode;

View File

@@ -1,16 +1,15 @@
package org.qora.test.assets;
package org.qortal.test.assets;
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.utils.NTP;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.AssetUtils;
import org.qortal.test.common.Common;
import org.qortal.utils.NTP;
import java.math.BigDecimal;
import java.util.Map;

View File

@@ -1,17 +1,17 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.RewardShareTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.RewardShareTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class AccountUtils {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.lang.reflect.Field;
import org.eclipse.jetty.server.Request;
import org.junit.Before;
import org.qora.repository.DataException;
import org.qortal.repository.DataException;
public class ApiCommon extends Common {

View File

@@ -1,28 +1,29 @@
package org.qora.test.common;
package org.qortal.test.common;
import static org.junit.Assert.assertNotNull;
import java.math.BigDecimal;
import java.util.Base64;
import java.util.Base64.Encoder;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.data.asset.OrderData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.CancelAssetOrderTransactionData;
import org.qortal.data.transaction.CreateAssetOrderTransactionData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferAssetTransactionData;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.transaction.Transaction;
import java.util.Map;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.BlockChain;
import org.qora.data.asset.OrderData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CancelAssetOrderTransactionData;
import org.qora.data.transaction.CreateAssetOrderTransactionData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.TransferAssetTransactionData;
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 {
public static final int txGroupId = Group.NO_GROUP;

View File

@@ -1,16 +1,16 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.math.BigDecimal;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.Block;
import org.qora.block.BlockChain;
import org.qora.block.BlockMinter;
import org.qora.data.block.BlockData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.Block;
import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter;
import org.qortal.data.block.BlockData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class BlockUtils {

View File

@@ -1,4 +1,4 @@
package org.qora.test.common;
package org.qortal.test.common;
import static org.junit.Assert.*;
@@ -21,18 +21,18 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.qora.block.BlockChain;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.asset.AssetData;
import org.qora.data.group.GroupData;
import org.qora.repository.AccountRepository.BalanceOrdering;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.settings.Settings;
import org.qora.utils.NTP;
import org.qortal.block.BlockChain;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.data.asset.AssetData;
import org.qortal.data.group.GroupData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryFactory;
import org.qortal.repository.RepositoryManager;
import org.qortal.repository.AccountRepository.BalanceOrdering;
import org.qortal.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qortal.settings.Settings;
import org.qortal.utils.NTP;
public class Common {

View File

@@ -1,4 +1,4 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.util.ArrayList;
import java.util.Collections;
@@ -7,7 +7,7 @@ import java.util.Random;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.qora.network.message.Message;
import org.qortal.network.message.Message;
public abstract class FakePeer implements Runnable {
private static final long DEFAULT_BROADCAST_INTERVAL = 60 * 1000;

View File

@@ -1,18 +1,18 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CreateGroupTransactionData;
import org.qora.data.transaction.GroupApprovalTransactionData;
import org.qora.data.transaction.JoinGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.group.Group.ApprovalThreshold;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.transaction.Transaction.ApprovalStatus;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.GroupApprovalTransactionData;
import org.qortal.data.transaction.JoinGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.transaction.Transaction.ApprovalStatus;
public class GroupUtils {

View File

@@ -1,4 +1,4 @@
package org.qora.test.common;
package org.qortal.test.common;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

View File

@@ -1,7 +1,7 @@
package org.qora.test.common;
package org.qortal.test.common;
import org.qora.network.message.Message;
import org.qora.test.common.FakePeer;
import org.qortal.network.message.Message;
import org.qortal.test.common.FakePeer;
public class PeerMessage {
public final FakePeer peer;

View File

@@ -1,8 +1,8 @@
package org.qora.test.common;
package org.qortal.test.common;
import org.qora.account.PrivateKeyAccount;
import org.qora.repository.Repository;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.repository.Repository;
import org.qortal.utils.Base58;
public class TestAccount extends PrivateKeyAccount {

View File

@@ -1,4 +1,4 @@
package org.qora.test.common;
package org.qortal.test.common;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -6,14 +6,14 @@ import static org.junit.Assert.assertTrue;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.test.common.transaction.TestTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transaction.Transaction.ValidationResult;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.TransactionType;
import org.qortal.transaction.Transaction.ValidationResult;
public class TransactionUtils {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.AccountFlagsTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.AccountFlagsTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class AccountFlagsTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.AccountLevelTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.AccountLevelTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class AccountLevelTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.AddGroupAdminTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.AddGroupAdminTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class AddGroupAdminTestTransaction extends TestTransaction {

View File

@@ -1,17 +1,17 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.PaymentData;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.ArbitraryTransactionData.DataType;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.PaymentData;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.ArbitraryTransactionData.DataType;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class ArbitraryTestTransaction extends TestTransaction {

View File

@@ -1,14 +1,14 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.crypto.Crypto;
import org.qora.data.transaction.ATTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.crypto.Crypto;
import org.qortal.data.transaction.ATTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class AtTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.BuyNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.BuyNameTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class BuyNameTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CancelAssetOrderTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CancelAssetOrderTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CancelAssetOrderTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CancelGroupBanTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CancelGroupBanTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CancelGroupBanTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CancelGroupInviteTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CancelGroupInviteTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CancelGroupInviteTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CancelSellNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CancelSellNameTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CancelSellNameTestTransaction extends TestTransaction {

View File

@@ -1,13 +1,13 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.transaction.CreateAssetOrderTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.CreateAssetOrderTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CreateAssetOrderTestTransaction extends TestTransaction {

View File

@@ -1,13 +1,13 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CreateGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group.ApprovalThreshold;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CreateGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CreateGroupTestTransaction extends TestTransaction {

View File

@@ -1,15 +1,15 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.CreatePollTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.voting.PollOptionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.CreatePollTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.voting.PollOptionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class CreatePollTestTransaction extends TestTransaction {

View File

@@ -1,14 +1,14 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.transaction.DeployAtTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.DeployAtTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class DeployAtTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.GenesisTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GenesisTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class GenesisTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.GroupApprovalTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GroupApprovalTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class GroupApprovalTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.GroupBanTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GroupBanTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class GroupBanTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.GroupInviteTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GroupInviteTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class GroupInviteTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.GroupKickTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.GroupKickTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class GroupKickTestTransaction extends TestTransaction {

View File

@@ -1,13 +1,13 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.test.common.AssetUtils;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.test.common.AssetUtils;
public class IssueAssetTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.JoinGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.JoinGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class JoinGroupTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.LeaveGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.LeaveGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class LeaveGroupTestTransaction extends TestTransaction {

View File

@@ -1,13 +1,13 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.transaction.MessageTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.MessageTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class MessageTestTransaction extends TestTransaction {

View File

@@ -1,16 +1,16 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.PaymentData;
import org.qora.data.transaction.MultiPaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.PaymentData;
import org.qortal.data.transaction.MultiPaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class MultiPaymentTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class PaymentTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.RegisterNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.RegisterNameTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class RegisterNameTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.RemoveGroupAdminTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.RemoveGroupAdminTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class RemoveGroupAdminTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.RewardShareTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.RewardShareTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class RewardShareTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.SellNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.SellNameTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class SellNameTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.SetGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.SetGroupTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class SetGroupTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.group.Group;
import org.qora.repository.DataException;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.block.BlockChain;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.group.Group;
import org.qortal.repository.DataException;
public abstract class TestTransaction {

View File

@@ -1,13 +1,13 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.math.BigDecimal;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.transaction.TransferAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferAssetTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class TransferAssetTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.TransferPrivsTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferPrivsTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class TransferPrivsTestTransaction extends TestTransaction {

View File

@@ -1,11 +1,11 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.UpdateAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.test.common.AssetUtils;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.UpdateAssetTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.test.common.AssetUtils;
public class UpdateAssetTestTransaction extends TestTransaction {

View File

@@ -1,11 +1,11 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.UpdateGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group.ApprovalThreshold;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.UpdateGroupTransactionData;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class UpdateGroupTestTransaction extends TestTransaction {

View File

@@ -1,10 +1,10 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.UpdateNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.UpdateNameTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class UpdateNameTestTransaction extends TestTransaction {

View File

@@ -1,12 +1,12 @@
package org.qora.test.common.transaction;
package org.qortal.test.common.transaction;
import java.util.Random;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.transaction.VoteOnPollTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.VoteOnPollTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
public class VoteOnPollTestTransaction extends TestTransaction {

View File

@@ -1,26 +1,26 @@
package org.qora.test.group;
package org.qortal.test.group;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.group.Group.ApprovalThreshold;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.GroupUtils;
import org.qora.test.common.TransactionUtils;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ApprovalStatus;
import org.qora.transaction.Transaction.ValidationResult;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.IssueAssetTransactionData;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group;
import org.qortal.group.Group.ApprovalThreshold;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.GroupUtils;
import org.qortal.test.common.TransactionUtils;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ApprovalStatus;
import org.qortal.transaction.Transaction.ValidationResult;
import static org.junit.Assert.*;

View File

@@ -1,4 +1,4 @@
package org.qora.test.minting;
package org.qortal.test.minting;
import static org.junit.Assert.*;
@@ -7,19 +7,19 @@ import java.math.BigDecimal;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.account.RewardShareData;
import org.qora.data.transaction.TransactionData;
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.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TransactionUtils;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.ValidationResult;
import org.qora.utils.Base58;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.account.RewardShareData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.transaction.Transaction;
import org.qortal.transaction.Transaction.ValidationResult;
import org.qortal.utils.Base58;
public class RewardShareTests extends Common {

View File

@@ -1,4 +1,4 @@
package org.qora.test.minting;
package org.qortal.test.minting;
import static org.junit.Assert.*;
@@ -10,19 +10,19 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.block.BlockChain.RewardByHeight;
import org.qora.data.account.AccountBalanceData;
import org.qora.block.BlockMinter;
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.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TestAccount;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter;
import org.qortal.block.BlockChain.RewardByHeight;
import org.qortal.data.account.AccountBalanceData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.AccountUtils;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
public class RewardTests extends Common {

View File

@@ -1,4 +1,4 @@
package org.qora.test.naming;
package org.qortal.test.naming;
import static org.junit.Assert.*;
@@ -8,19 +8,19 @@ import java.util.Random;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.data.naming.NameData;
import org.qora.data.transaction.BuyNameTransactionData;
import org.qora.data.transaction.CancelSellNameTransactionData;
import org.qora.data.transaction.RegisterNameTransactionData;
import org.qora.data.transaction.SellNameTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.test.common.BlockUtils;
import org.qora.test.common.Common;
import org.qora.test.common.TransactionUtils;
import org.qora.test.common.transaction.TestTransaction;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.data.naming.NameData;
import org.qortal.data.transaction.BuyNameTransactionData;
import org.qortal.data.transaction.CancelSellNameTransactionData;
import org.qortal.data.transaction.RegisterNameTransactionData;
import org.qortal.data.transaction.SellNameTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
public class BuySellTests extends Common {

View File

@@ -114,8 +114,8 @@
If minting address's private key is not available decrypted then do pop-up asking for password then decrypt and save into <tt>cachedPrivateKeys</tt>.<br>
See &lt;script&gt; code in this page's source.
<p>
If recipient does not have public key yet (fetch using API) then do pop-up asking if minting account should send small amount of QORA.<br>
When recipient receives QORA they need to do a transaction, for example: JOIN_GROUP 2, which will make their public key available from the blockchain/API.
If recipient does not have public key yet (fetch using API) then do pop-up asking if minting account should send small amount of QORT.<br>
When recipient receives QORT they need to do a transaction, for example: JOIN_GROUP 2, which will make their public key available from the blockchain/API.
</i>
</div>

View File

@@ -36,7 +36,7 @@
"votingTimestamp": 0,
"arbitraryTimestamp": 0,
"powfixTimestamp": 0,
"v2Timestamp": 1600000000000,
"qortalTimestamp": 1600000000000,
"newAssetPricingTimestamp": 1600000000000,
"groupApprovalTimestamp": 0
},

View File

@@ -36,7 +36,7 @@
"votingTimestamp": 0,
"arbitraryTimestamp": 0,
"powfixTimestamp": 0,
"v2Timestamp": 0,
"qortalTimestamp": 0,
"newAssetPricingTimestamp": 0,
"groupApprovalTimestamp": 0
},

View File

@@ -36,7 +36,7 @@
"votingTimestamp": 0,
"arbitraryTimestamp": 0,
"powfixTimestamp": 0,
"v2Timestamp": 0,
"qortalTimestamp": 0,
"newAssetPricingTimestamp": 0,
"groupApprovalTimestamp": 0
},

View File

@@ -36,7 +36,7 @@
"votingTimestamp": 0,
"arbitraryTimestamp": 0,
"powfixTimestamp": 0,
"v2Timestamp": 0,
"qortalTimestamp": 0,
"newAssetPricingTimestamp": 0,
"groupApprovalTimestamp": 0
},