AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Use the timestamp from the registerNameTransactionData in unit tests, rather than the current time.

Browse Source
This commit is contained in:
CalDescent 2022-02-13 15:05:28 +00:00
parent 265ae19591
commit 83213800b9
10 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/org/qortal/test/api/NamesApiTests.java
View File

@ -49,7 +49,7 @@ public class NamesApiTests extends ApiCommon {
String name = "test-name";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "{}");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
assertNotNull(this.namesResource.getNamesByAddress(alice.getAddress(), null, null, null));
@ -65,7 +65,7 @@ public class NamesApiTests extends ApiCommon {
String name = "test-name";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "{}");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
assertNotNull(this.namesResource.getName(name));
@ -81,7 +81,7 @@ public class NamesApiTests extends ApiCommon {
long price = 1_23456789L;
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "{}");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Sell-name

4
src/test/java/org/qortal/test/arbitrary/ArbitraryDataStorageCapacityTests.java
View File

@ -154,7 +154,7 @@ public class ArbitraryDataStorageCapacityTests extends Common {
PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
String aliceName = "alice";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), aliceName, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
Path alicePath = ArbitraryUtils.generateRandomDataPath(dataLength);
ArbitraryDataFile aliceArbitraryDataFile = ArbitraryUtils.createAndMintTxn(repository, Base58.encode(alice.getPublicKey()), alicePath, aliceName, identifier, ArbitraryTransactionData.Method.PUT, service, alice, chunkSize);
@ -163,7 +163,7 @@ public class ArbitraryDataStorageCapacityTests extends Common {
PrivateKeyAccount bob = Common.getTestAccount(repository, "bob");
String bobName = "bob";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(bob), bobName, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, bob);
Path bobPath = ArbitraryUtils.generateRandomDataPath(dataLength);
ArbitraryDataFile bobArbitraryDataFile = ArbitraryUtils.createAndMintTxn(repository, Base58.encode(bob.getPublicKey()), bobPath, bobName, identifier, ArbitraryTransactionData.Method.PUT, service, bob, chunkSize);

10
src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java
View File

@ -62,7 +62,7 @@ public class ArbitraryDataStoragePolicyTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create transaction
@ -97,7 +97,7 @@ public class ArbitraryDataStoragePolicyTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create transaction
@ -132,7 +132,7 @@ public class ArbitraryDataStoragePolicyTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create transaction
@ -167,7 +167,7 @@ public class ArbitraryDataStoragePolicyTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create transaction
@ -202,7 +202,7 @@ public class ArbitraryDataStoragePolicyTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create transaction

18
src/test/java/org/qortal/test/arbitrary/ArbitraryDataTests.java
View File

@ -57,7 +57,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -152,7 +152,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -185,7 +185,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -231,7 +231,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -300,7 +300,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -350,7 +350,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -388,7 +388,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -418,7 +418,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction
@ -445,7 +445,7 @@ public class ArbitraryDataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction

2
src/test/java/org/qortal/test/arbitrary/ArbitraryTransactionMetadataTests.java
View File

@ -52,7 +52,7 @@ public class ArbitraryTransactionMetadataTests extends Common {
// Register the name to Alice
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Create PUT transaction

2
src/test/java/org/qortal/test/arbitrary/ArbitraryTransactionTests.java
View File

@ -48,7 +48,7 @@ public class ArbitraryTransactionTests extends Common {
// Register the name to Alice
RegisterNameTransactionData registerNameTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "");
registerNameTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
registerNameTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(registerNameTransactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, registerNameTransactionData, alice);
// Set difficulty to 1

2
src/test/java/org/qortal/test/naming/BuySellTests.java
View File

@ -64,7 +64,7 @@ public class BuySellTests extends Common {
public void testRegisterName() throws DataException {
// Register-name
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, "{}");
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
String name = transactionData.getName();

30
src/test/java/org/qortal/test/naming/IntegrityTests.java
View File

@ -35,7 +35,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -59,7 +59,7 @@ public class IntegrityTests extends Common {
String data = "\uD83E\uDD73";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -86,7 +86,7 @@ public class IntegrityTests extends Common {
String name = "initial_name";
String data = "initial_data";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Update the name, but keep the new name blank
@ -121,7 +121,7 @@ public class IntegrityTests extends Common {
String name = "initial_name";
String data = "initial_data";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Update the name, but keep the new name blank
@ -149,7 +149,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -179,7 +179,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -218,7 +218,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -244,7 +244,7 @@ public class IntegrityTests extends Common {
// Attempt to register the new name
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), newName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
@ -264,7 +264,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -279,7 +279,7 @@ public class IntegrityTests extends Common {
// Attempt to register the name again
String duplicateName = "TEST-nÁme";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), duplicateName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
@ -299,7 +299,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -333,7 +333,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -343,7 +343,7 @@ public class IntegrityTests extends Common {
String secondName = "new-missing-name";
String secondNameData = "{\"data2\":true}";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), secondName, secondNameData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the second name exists and the data is correct
@ -377,7 +377,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -409,7 +409,7 @@ public class IntegrityTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct

30
src/test/java/org/qortal/test/naming/MiscTests.java
View File

@ -40,7 +40,7 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
List<String> recentNames = repository.getNameRepository().getRecentNames(0L);
@ -60,13 +60,13 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// duplicate
String duplicateName = "TEST-nÁme";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), duplicateName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
@ -85,14 +85,14 @@ public class MiscTests extends Common {
String data = "{}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// duplicate (this time registered by Bob)
PrivateKeyAccount bob = Common.getTestAccount(repository, "bob");
String duplicateName = "TEST-nÁme";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(bob), duplicateName, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
@ -111,14 +111,14 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Register another name that we will later attempt to rename to first name (above)
String otherName = "new-name";
String otherData = "";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), otherName, otherData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// we shouldn't be able to update name to existing name
@ -142,7 +142,7 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
@ -161,7 +161,7 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// we shouldn't be able to update name to an address
@ -190,7 +190,7 @@ public class MiscTests extends Common {
// Register the name
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -217,7 +217,7 @@ public class MiscTests extends Common {
// Register the name
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -269,7 +269,7 @@ public class MiscTests extends Common {
// Register the name
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Ensure the name exists and the data is correct
@ -301,7 +301,7 @@ public class MiscTests extends Common {
PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
// Ensure the name doesn't exist
assertNull(repository.getNameRepository().fromName(name));
@ -343,7 +343,7 @@ public class MiscTests extends Common {
String data = "{\"age\":30}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
assertEquals(10000000L, transactionData.getFee().longValue());
TransactionUtils.signAndMint(repository, transactionData, alice);
@ -364,7 +364,7 @@ public class MiscTests extends Common {
// Now try using correct fee (this is specified by the UI, via the /transaction/unitfee API endpoint)
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name2, data);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
assertEquals(500000000L, transactionData.getFee().longValue());
transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);

14
src/test/java/org/qortal/test/naming/UpdateTests.java
View File

@ -36,7 +36,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(initialTransactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, initialTransactionData, alice);
// Check name, reduced name, and data exist
@ -103,7 +103,7 @@ public class UpdateTests extends Common {
String constantReducedName = "initia1-name";
TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(initialTransactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, initialTransactionData, alice);
// Check initial name exists
@ -151,7 +151,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
initialTransactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(initialTransactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, initialTransactionData, alice);
// Check initial name exists
@ -230,7 +230,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Check initial name exists
@ -288,7 +288,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Check initial name exists
@ -330,7 +330,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Check initial name exists
@ -393,7 +393,7 @@ public class UpdateTests extends Common {
String initialData = "{\"age\":30}";
TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(NTP.getTime()));
transactionData.setFee(new RegisterNameTransaction(null, null).getUnitFee(transactionData.getTimestamp()));;
TransactionUtils.signAndMint(repository, transactionData, alice);
// Check initial name exists