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

Fixed API call GET /blocks/minter/{address}. Now returns block summaries instead of full block data.

Browse Source
This commit is contained in:
catbref
2020-02-06 14:28:02 +00:00
parent 1cb2935cad
commit 774a8f20ee
6 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/qortal/test/api/BlockApiTests.java
View File

@@ -26,7 +26,7 @@ public class BlockApiTests extends ApiCommon {
}
@Test
public void testGetBlockForgers() {
public void testGetBlockMinters() {
List<String> addresses = Arrays.asList(aliceAddress, aliceAddress);
assertNotNull(this.blocksResource.getBlockMinters(Collections.emptyList(), null, null, null));
@@ -36,9 +36,9 @@ public class BlockApiTests extends ApiCommon {
}
@Test
public void testGetBlocksByForger() {
assertNotNull(this.blocksResource.getBlocksByMinter(aliceAddress, null, null, null));
assertNotNull(this.blocksResource.getBlocksByMinter(aliceAddress, 1, 1, true));
public void testGetBlockSummariesByMinter() {
assertNotNull(this.blocksResource.getBlockSummariesByMinter(aliceAddress, null, null, null));
assertNotNull(this.blocksResource.getBlockSummariesByMinter(aliceAddress, 1, 1, true));
}
}

12
src/test/java/org/qortal/test/group/GroupApprovalTests.java
View File

@@ -110,7 +110,7 @@ public class GroupApprovalTests extends Common {
// Transaction fee should have ended up in forging account
BigDecimal alicePostAssetBalance = aliceAccount.getConfirmedBalance(Asset.QORT);
Common.assertEqualBigDecimals("block forger's balance incorrect", aliceOriginalBalance.add(blockReward).add(fee), alicePostAssetBalance);
Common.assertEqualBigDecimals("block minter's balance incorrect", aliceOriginalBalance.add(blockReward).add(fee), alicePostAssetBalance);
// Have Bob do a non-approval transaction to change his last-reference
Transaction bobPaymentTransaction = buildPaymentTransaction(repository, "bob", "chloe", amount, Group.NO_GROUP);
@@ -122,7 +122,7 @@ public class GroupApprovalTests extends Common {
// Have Alice approve Bob's approval-needed transaction
GroupUtils.approveTransaction(repository, "alice", bobAssetTransaction.getTransactionData().getSignature(), true);
// Now forge a few blocks so transaction is approved
// Now mint a few blocks so transaction is approved
for (int blockCount = 0; blockCount < minBlockDelay; ++blockCount)
BlockUtils.mintBlock(repository);
@@ -195,7 +195,7 @@ public class GroupApprovalTests extends Common {
// Have Alice approve Bob's approval-needed transaction
GroupUtils.approveTransaction(repository, "alice", bobAssetTransaction.getTransactionData().getSignature(), true);
// Now forge a few blocks so transaction is approved
// Now mint a few blocks so transaction is approved
for (int blockCount = 0; blockCount < minBlockDelay; ++blockCount)
BlockUtils.mintBlock(repository);
@@ -256,7 +256,7 @@ public class GroupApprovalTests extends Common {
// Have Alice reject Bob's approval-needed transaction
GroupUtils.approveTransaction(repository, "alice", bobAssetTransaction.getTransactionData().getSignature(), false);
// Now forge a few blocks so transaction is approved
// Now mint a few blocks so transaction is approved
for (int blockCount = 0; blockCount < minBlockDelay; ++blockCount)
BlockUtils.mintBlock(repository);
@@ -314,7 +314,7 @@ public class GroupApprovalTests extends Common {
Integer approvalHeight = GroupUtils.getApprovalHeight(repository, bobAssetTransaction.getTransactionData().getSignature());
assertNull("group-approval decision height should be null", approvalHeight);
// Now forge a few blocks so group-approval for transaction expires
// Now mint a few blocks so group-approval for transaction expires
for (int blockCount = 0; blockCount <= maxBlockDelay; ++blockCount)
BlockUtils.mintBlock(repository);
@@ -374,7 +374,7 @@ public class GroupApprovalTests extends Common {
approvalStatus = GroupUtils.getApprovalStatus(repository, aliceAssetTransaction.getTransactionData().getSignature());
assertEquals("incorrect transaction approval status", ApprovalStatus.NOT_REQUIRED, approvalStatus);
// Now forge a few blocks so transaction is approved
// Now mint a few blocks so transaction is approved
for (int blockCount = 0; blockCount < minBlockDelay; ++blockCount)
BlockUtils.mintBlock(repository);