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

Added unit tests for trimming, pruning, and archiving.

Browse Source
This commit is contained in:
CalDescent
2021-09-12 10:13:52 +01:00
parent 9813dde3d9
commit 74ea2a847d
7 changed files with 781 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qortal/controller/BlockMinter.java
View File

@@ -442,7 +442,8 @@ public class BlockMinter extends Thread {
// Add to blockchain
newBlock.process();
LOGGER.info(String.format("Minted new test block: %d", newBlock.getBlockData().getHeight()));
LOGGER.info(String.format("Minted new test block: %d sig: %.8s",
newBlock.getBlockData().getHeight(), Base58.encode(newBlock.getBlockData().getSignature())));
repository.saveChanges();

25
src/main/java/org/qortal/repository/BlockArchiveWriter.java
View File

@@ -33,7 +33,11 @@ public class BlockArchiveWriter {
private final int endHeight;
private final Repository repository;
private long fileSizeTarget = 100 * 1024 * 1024; // 100MiB
private boolean shouldEnforceFileSizeTarget = true;
private int writtenCount;
private Path outputPath;
public BlockArchiveWriter(int startHeight, int endHeight, Repository repository) {
this.startHeight = startHeight;
@@ -87,8 +91,9 @@ public class BlockArchiveWriter {
LOGGER.info(String.format("Fetching blocks from height %d...", startHeight));
int i = 0;
long fileSizeTarget = 100 * 1024 * 1024; // 100MiB
while (headerBytes.size() + bytes.size() < fileSizeTarget) {
while (headerBytes.size() + bytes.size() < this.fileSizeTarget
|| this.shouldEnforceFileSizeTarget == false) {
if (Controller.isStopping()) {
return BlockArchiveWriteResult.STOPPING;
}
@@ -132,7 +137,7 @@ public class BlockArchiveWriter {
LOGGER.info(String.format("Total length of %d blocks is %d bytes", i, totalLength));
// Validate file size, in case something went wrong
if (totalLength < fileSizeTarget) {
if (totalLength < fileSizeTarget && this.shouldEnforceFileSizeTarget) {
return BlockArchiveWriteResult.NOT_ENOUGH_BLOCKS;
}
@@ -164,6 +169,7 @@ public class BlockArchiveWriter {
BlockArchiveReader.getInstance().invalidateFileListCache();
this.writtenCount = i;
this.outputPath = Paths.get(filePath);
return BlockArchiveWriteResult.OK;
}
@@ -171,4 +177,17 @@ public class BlockArchiveWriter {
return this.writtenCount;
}
public Path getOutputPath() {
return this.outputPath;
}
public void setFileSizeTarget(long fileSizeTarget) {
this.fileSizeTarget = fileSizeTarget;
}
// For testing, to avoid having to pre-calculate file sizes
public void setShouldEnforceFileSizeTarget(boolean shouldEnforceFileSizeTarget) {
this.shouldEnforceFileSizeTarget = shouldEnforceFileSizeTarget;
}
}