Add logging to block archive unit tests

This commit is contained in:
QuickMythril 2024-11-13 06:16:39 -05:00
parent 1676098abe
commit 82d5d25c59
2 changed files with 1112 additions and 813 deletions

File diff suppressed because it is too large Load Diff

View File

@ -34,471 +34,625 @@ import static org.junit.Assert.*;
public class BlockArchiveV2Tests extends Common { public class BlockArchiveV2Tests extends Common {
@Before @Before
public void beforeTest() throws DataException, IllegalAccessException { public void beforeTest() throws DataException, IllegalAccessException {
Common.useSettings("test-settings-v2-block-archive.json"); Common.useSettings("test-settings-v2-block-archive.json");
NTP.setFixedOffset(Settings.getInstance().getTestNtpOffset()); NTP.setFixedOffset(Settings.getInstance().getTestNtpOffset());
this.deleteArchiveDirectory(); this.deleteArchiveDirectory();
// Set default archive version to 2, so that archive builds in these tests use V2 // Set default archive version to 2, so that archive builds in these tests use V2
FieldUtils.writeField(Settings.getInstance(), "defaultArchiveVersion", 2, true); FieldUtils.writeField(Settings.getInstance(), "defaultArchiveVersion", 2, true);
} }
@After @After
public void afterTest() throws DataException { public void afterTest() throws DataException {
this.deleteArchiveDirectory(); this.deleteArchiveDirectory();
} }
@Test @Test
public void testWriter() throws DataException, InterruptedException, TransformationException, IOException { public void testWriter() throws DataException, InterruptedException, TransformationException, IOException {
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {
// Mint some blocks so that we are able to archive them later System.out.println("Starting testWriter");
for (int i = 0; i < 1000; i++) {
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
}
// 900 blocks are trimmed (this specifies the first untrimmed height) // Mint some blocks so that we are able to archive them later
repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901); System.out.println("Minting 1000 blocks...");
repository.getATRepository().setAtTrimHeight(901); for (int i = 0; i < 1000; i++) {
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
// Log every 100 blocks
if ((i + 1) % 100 == 0) {
System.out.println("Minted block " + (i + 1));
}
}
System.out.println("Finished minting blocks.");
// Check the max archive height - this should be one less than the first untrimmed height // 900 blocks are trimmed (this specifies the first untrimmed height)
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository); repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
assertEquals(900, maximumArchiveHeight); repository.getATRepository().setAtTrimHeight(901);
System.out.println("Set trim heights to 901.");
// Write blocks 2-900 to the archive // Check the max archive height - this should be one less than the first untrimmed height
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write(); assertEquals(900, maximumArchiveHeight);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Make sure that the archive contains the correct number of blocks // Write blocks 2-900 to the archive
assertEquals(900 - 1, writer.getWrittenCount()); System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
System.out.println("Finished writing blocks to archive. Result: " + result);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Increment block archive height // Make sure that the archive contains the correct number of blocks
repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount()); System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
repository.saveChanges(); assertEquals(900 - 1, writer.getWrittenCount());
assertEquals(900 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
// Ensure the file exists // Increment block archive height
File outputFile = writer.getOutputPath().toFile(); repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
assertTrue(outputFile.exists()); repository.saveChanges();
} assertEquals(900 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
}
@Test // Ensure the file exists
public void testWriterAndReader() throws DataException, InterruptedException, TransformationException, IOException { File outputFile = writer.getOutputPath().toFile();
try (final Repository repository = RepositoryManager.getRepository()) { assertTrue(outputFile.exists());
System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
// Mint some blocks so that we are able to archive them later System.out.println("testWriter completed successfully.");
for (int i = 0; i < 1000; i++) { }
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share")); }
}
// 900 blocks are trimmed (this specifies the first untrimmed height) @Test
repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901); public void testWriterAndReader() throws DataException, InterruptedException, TransformationException, IOException {
repository.getATRepository().setAtTrimHeight(901); try (final Repository repository = RepositoryManager.getRepository()) {
// Check the max archive height - this should be one less than the first untrimmed height System.out.println("Starting testWriterAndReader");
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
assertEquals(900, maximumArchiveHeight);
// Write blocks 2-900 to the archive // Mint some blocks so that we are able to archive them later
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository); System.out.println("Minting 1000 blocks...");
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes for (int i = 0; i < 1000; i++) {
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write(); BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result); // Log every 100 blocks
if ((i + 1) % 100 == 0) {
System.out.println("Minted block " + (i + 1));
}
}
System.out.println("Finished minting blocks.");
// Make sure that the archive contains the correct number of blocks // 900 blocks are trimmed (this specifies the first untrimmed height)
assertEquals(900 - 1, writer.getWrittenCount()); repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
repository.getATRepository().setAtTrimHeight(901);
System.out.println("Set trim heights to 901.");
// Increment block archive height // Check the max archive height - this should be one less than the first untrimmed height
repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount()); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
repository.saveChanges(); System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
assertEquals(900 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight()); assertEquals(900, maximumArchiveHeight);
// Ensure the file exists // Write blocks 2-900 to the archive
File outputFile = writer.getOutputPath().toFile(); System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
assertTrue(outputFile.exists()); BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
System.out.println("Finished writing blocks to archive. Result: " + result);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Read block 2 from the archive // Make sure that the archive contains the correct number of blocks
BlockArchiveReader reader = BlockArchiveReader.getInstance(); System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
BlockTransformation block2Info = reader.fetchBlockAtHeight(2); assertEquals(900 - 1, writer.getWrittenCount());
BlockData block2ArchiveData = block2Info.getBlockData();
// Read block 2 from the repository // Increment block archive height
BlockData block2RepositoryData = repository.getBlockRepository().fromHeight(2); repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
repository.saveChanges();
assertEquals(900 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
// Ensure the values match // Ensure the file exists
assertEquals(block2ArchiveData.getHeight(), block2RepositoryData.getHeight()); File outputFile = writer.getOutputPath().toFile();
assertArrayEquals(block2ArchiveData.getSignature(), block2RepositoryData.getSignature()); assertTrue(outputFile.exists());
System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
// Test some values in the archive // Read block 2 from the archive
assertEquals(1, block2ArchiveData.getOnlineAccountsCount()); System.out.println("Reading block 2 from the archive...");
BlockArchiveReader reader = BlockArchiveReader.getInstance();
BlockTransformation block2Info = reader.fetchBlockAtHeight(2);
BlockData block2ArchiveData = block2Info.getBlockData();
// Read block 900 from the archive // Read block 2 from the repository
BlockTransformation block900Info = reader.fetchBlockAtHeight(900); BlockData block2RepositoryData = repository.getBlockRepository().fromHeight(2);
BlockData block900ArchiveData = block900Info.getBlockData();
// Read block 900 from the repository // Ensure the values match
BlockData block900RepositoryData = repository.getBlockRepository().fromHeight(900); System.out.println("Comparing block 2 data...");
assertEquals(block2ArchiveData.getHeight(), block2RepositoryData.getHeight());
assertArrayEquals(block2ArchiveData.getSignature(), block2RepositoryData.getSignature());
// Ensure the values match // Test some values in the archive
assertEquals(block900ArchiveData.getHeight(), block900RepositoryData.getHeight()); assertEquals(1, block2ArchiveData.getOnlineAccountsCount());
assertArrayEquals(block900ArchiveData.getSignature(), block900RepositoryData.getSignature());
// Test some values in the archive // Read block 900 from the archive
assertEquals(1, block900ArchiveData.getOnlineAccountsCount()); System.out.println("Reading block 900 from the archive...");
BlockTransformation block900Info = reader.fetchBlockAtHeight(900);
BlockData block900ArchiveData = block900Info.getBlockData();
} // Read block 900 from the repository
} BlockData block900RepositoryData = repository.getBlockRepository().fromHeight(900);
@Test // Ensure the values match
public void testArchivedAtStates() throws DataException, InterruptedException, TransformationException, IOException { System.out.println("Comparing block 900 data...");
try (final Repository repository = RepositoryManager.getRepository()) { assertEquals(block900ArchiveData.getHeight(), block900RepositoryData.getHeight());
assertArrayEquals(block900ArchiveData.getSignature(), block900RepositoryData.getSignature());
// Deploy an AT so that we have AT state data // Test some values in the archive
PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice"); assertEquals(1, block900ArchiveData.getOnlineAccountsCount());
byte[] creationBytes = AtUtils.buildSimpleAT();
long fundingAmount = 1_00000000L;
DeployAtTransaction deployAtTransaction = AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
String atAddress = deployAtTransaction.getATAccount().getAddress();
// Mint some blocks so that we are able to archive them later System.out.println("testWriterAndReader completed successfully.");
for (int i = 0; i < 1000; i++) { }
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share")); }
}
// 9 blocks are trimmed (this specifies the first untrimmed height) @Test
repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(10); public void testArchivedAtStates() throws DataException, InterruptedException, TransformationException, IOException {
repository.getATRepository().setAtTrimHeight(10); try (final Repository repository = RepositoryManager.getRepository()) {
// Check the max archive height System.out.println("Starting testArchivedAtStates");
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
assertEquals(9, maximumArchiveHeight);
// Write blocks 2-9 to the archive // Deploy an AT so that we have AT state data
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository); System.out.println("Deploying AT...");
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write(); byte[] creationBytes = AtUtils.buildSimpleAT();
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result); long fundingAmount = 1_00000000L;
DeployAtTransaction deployAtTransaction = AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
String atAddress = deployAtTransaction.getATAccount().getAddress();
System.out.println("AT deployed at address: " + atAddress);
// Make sure that the archive contains the correct number of blocks // Mint some blocks so that we are able to archive them later
assertEquals(9 - 1, writer.getWrittenCount()); System.out.println("Minting 1000 blocks...");
for (int i = 0; i < 1000; i++) {
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
// Log every 100 blocks
if ((i + 1) % 100 == 0) {
System.out.println("Minted block " + (i + 1));
}
}
System.out.println("Finished minting blocks.");
// Increment block archive height // 9 blocks are trimmed (this specifies the first untrimmed height)
repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount()); repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(10);
repository.saveChanges(); repository.getATRepository().setAtTrimHeight(10);
assertEquals(9 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight()); System.out.println("Set trim heights to 10.");
// Ensure the file exists // Check the max archive height
File outputFile = writer.getOutputPath().toFile(); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
assertTrue(outputFile.exists()); System.out.println("Maximum archive height (Expected 9): " + maximumArchiveHeight);
assertEquals(9, maximumArchiveHeight);
// Check blocks 3-9 // Write blocks 2-9 to the archive
for (Integer testHeight = 2; testHeight <= 9; testHeight++) { System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
System.out.println("Finished writing blocks to archive. Result: " + result);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Read a block from the archive // Make sure that the archive contains the correct number of blocks
BlockArchiveReader reader = BlockArchiveReader.getInstance(); System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 8)");
BlockTransformation blockInfo = reader.fetchBlockAtHeight(testHeight); assertEquals(9 - 1, writer.getWrittenCount());
BlockData archivedBlockData = blockInfo.getBlockData();
byte[] archivedAtStateHash = blockInfo.getAtStatesHash();
List<TransactionData> archivedTransactions = blockInfo.getTransactions();
// Read the same block from the repository // Increment block archive height
BlockData repositoryBlockData = repository.getBlockRepository().fromHeight(testHeight); repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
ATStateData repositoryAtStateData = repository.getATRepository().getATStateAtHeight(atAddress, testHeight); repository.saveChanges();
assertEquals(9 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
System.out.println("Block archive height updated to: " + (9 - 1));
// Ensure the repository has full AT state data // Ensure the file exists
assertNotNull(repositoryAtStateData.getStateHash()); File outputFile = writer.getOutputPath().toFile();
assertNotNull(repositoryAtStateData.getStateData()); assertTrue(outputFile.exists());
System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
// Check the archived AT state // Check blocks 3-9
if (testHeight == 2) { System.out.println("Checking blocks 2 to 9...");
assertEquals(1, archivedTransactions.size()); for (Integer testHeight = 2; testHeight <= 9; testHeight++) {
assertEquals(Transaction.TransactionType.DEPLOY_AT, archivedTransactions.get(0).getType());
} System.out.println("Reading block " + testHeight + " from the archive...");
// Read a block from the archive
BlockArchiveReader reader = BlockArchiveReader.getInstance();
BlockTransformation blockInfo = reader.fetchBlockAtHeight(testHeight);
BlockData archivedBlockData = blockInfo.getBlockData();
byte[] archivedAtStateHash = blockInfo.getAtStatesHash();
List<TransactionData> archivedTransactions = blockInfo.getTransactions();
// Read the same block from the repository
BlockData repositoryBlockData = repository.getBlockRepository().fromHeight(testHeight);
ATStateData repositoryAtStateData = repository.getATRepository().getATStateAtHeight(atAddress, testHeight);
// Ensure the repository has full AT state data
assertNotNull(repositoryAtStateData.getStateHash());
assertNotNull(repositoryAtStateData.getStateData());
// Check the archived AT state
if (testHeight == 2) {
System.out.println("Checking block " + testHeight + " AT state data (expected transactions)...");
assertEquals(1, archivedTransactions.size());
assertEquals(Transaction.TransactionType.DEPLOY_AT, archivedTransactions.get(0).getType());
}
else { else {
// Blocks 3+ shouldn't have any transactions System.out.println("Checking block " + testHeight + " AT state data (no transactions expected)...");
assertTrue(archivedTransactions.isEmpty()); // Blocks 3+ shouldn't have any transactions
} assertTrue(archivedTransactions.isEmpty());
}
// Ensure the archive has the AT states hash // Ensure the archive has the AT states hash
assertNotNull(archivedAtStateHash); System.out.println("Checking block " + testHeight + " AT states hash...");
assertNotNull(archivedAtStateHash);
// Also check the online accounts count and height // Also check the online accounts count and height
assertEquals(1, archivedBlockData.getOnlineAccountsCount()); assertEquals(1, archivedBlockData.getOnlineAccountsCount());
assertEquals(testHeight, archivedBlockData.getHeight()); assertEquals(testHeight, archivedBlockData.getHeight());
// Ensure the values match // Ensure the values match
assertEquals(archivedBlockData.getHeight(), repositoryBlockData.getHeight()); System.out.println("Comparing block " + testHeight + " data...");
assertArrayEquals(archivedBlockData.getSignature(), repositoryBlockData.getSignature()); assertEquals(archivedBlockData.getHeight(), repositoryBlockData.getHeight());
assertEquals(archivedBlockData.getOnlineAccountsCount(), repositoryBlockData.getOnlineAccountsCount()); assertArrayEquals(archivedBlockData.getSignature(), repositoryBlockData.getSignature());
assertArrayEquals(archivedBlockData.getMinterSignature(), repositoryBlockData.getMinterSignature()); assertEquals(archivedBlockData.getOnlineAccountsCount(), repositoryBlockData.getOnlineAccountsCount());
assertEquals(archivedBlockData.getATCount(), repositoryBlockData.getATCount()); assertArrayEquals(archivedBlockData.getMinterSignature(), repositoryBlockData.getMinterSignature());
assertEquals(archivedBlockData.getOnlineAccountsCount(), repositoryBlockData.getOnlineAccountsCount()); assertEquals(archivedBlockData.getATCount(), repositoryBlockData.getATCount());
assertArrayEquals(archivedBlockData.getReference(), repositoryBlockData.getReference()); assertEquals(archivedBlockData.getOnlineAccountsCount(), repositoryBlockData.getOnlineAccountsCount());
assertEquals(archivedBlockData.getTimestamp(), repositoryBlockData.getTimestamp()); assertArrayEquals(archivedBlockData.getReference(), repositoryBlockData.getReference());
assertEquals(archivedBlockData.getATFees(), repositoryBlockData.getATFees()); assertEquals(archivedBlockData.getTimestamp(), repositoryBlockData.getTimestamp());
assertEquals(archivedBlockData.getTotalFees(), repositoryBlockData.getTotalFees()); assertEquals(archivedBlockData.getATFees(), repositoryBlockData.getATFees());
assertEquals(archivedBlockData.getTransactionCount(), repositoryBlockData.getTransactionCount()); assertEquals(archivedBlockData.getTotalFees(), repositoryBlockData.getTotalFees());
assertArrayEquals(archivedBlockData.getTransactionsSignature(), repositoryBlockData.getTransactionsSignature()); assertEquals(archivedBlockData.getTransactionCount(), repositoryBlockData.getTransactionCount());
assertArrayEquals(archivedBlockData.getTransactionsSignature(), repositoryBlockData.getTransactionsSignature());
// TODO: build atStatesHash and compare against value in archive // TODO: build atStatesHash and compare against value in archive
} }
// Check block 10 (unarchived) // Check block 10 (unarchived)
BlockArchiveReader reader = BlockArchiveReader.getInstance(); System.out.println("Checking block 10 (should not be in archive)...");
BlockTransformation blockInfo = reader.fetchBlockAtHeight(10); BlockArchiveReader reader = BlockArchiveReader.getInstance();
assertNull(blockInfo); BlockTransformation blockInfo = reader.fetchBlockAtHeight(10);
assertNull(blockInfo);
} System.out.println("testArchivedAtStates completed successfully.");
}
} }
@Test @Test
public void testArchiveAndPrune() throws DataException, InterruptedException, TransformationException, IOException { public void testArchiveAndPrune() throws DataException, InterruptedException, TransformationException, IOException {
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {
// Deploy an AT so that we have AT state data System.out.println("Starting testArchiveAndPrune");
PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
byte[] creationBytes = AtUtils.buildSimpleAT();
long fundingAmount = 1_00000000L;
AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
// Mint some blocks so that we are able to archive them later // Deploy an AT so that we have AT state data
for (int i = 0; i < 1000; i++) { System.out.println("Deploying AT...");
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share")); PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
} byte[] creationBytes = AtUtils.buildSimpleAT();
long fundingAmount = 1_00000000L;
AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
System.out.println("AT deployed successfully.");
// Assume 900 blocks are trimmed (this specifies the first untrimmed height) // Mint some blocks so that we are able to archive them later
repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901); System.out.println("Minting 1000 blocks...");
repository.getATRepository().setAtTrimHeight(901); for (int i = 0; i < 1000; i++) {
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
// Log every 100 blocks
if ((i + 1) % 100 == 0) {
System.out.println("Minted block " + (i + 1));
}
}
System.out.println("Finished minting blocks.");
// Check the max archive height - this should be one less than the first untrimmed height // Assume 900 blocks are trimmed (this specifies the first untrimmed height)
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository); repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(901);
assertEquals(900, maximumArchiveHeight); repository.getATRepository().setAtTrimHeight(901);
System.out.println("Set trim heights to 901.");
// Write blocks 2-900 to the archive // Check the max archive height - this should be one less than the first untrimmed height
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes System.out.println("Maximum archive height (Expected 900): " + maximumArchiveHeight);
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write(); assertEquals(900, maximumArchiveHeight);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Make sure that the archive contains the correct number of blocks // Write blocks 2-900 to the archive
assertEquals(900 - 1, writer.getWrittenCount()); System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
System.out.println("Finished writing blocks to archive. Result: " + result);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Increment block archive height // Make sure that the archive contains the correct number of blocks
repository.getBlockArchiveRepository().setBlockArchiveHeight(901); System.out.println("Archive contains " + writer.getWrittenCount() + " blocks. (Expected 899)");
repository.saveChanges(); assertEquals(900 - 1, writer.getWrittenCount());
assertEquals(901, repository.getBlockArchiveRepository().getBlockArchiveHeight());
// Ensure the file exists // Increment block archive height
File outputFile = writer.getOutputPath().toFile(); repository.getBlockArchiveRepository().setBlockArchiveHeight(901);
assertTrue(outputFile.exists()); repository.saveChanges();
assertEquals(901, repository.getBlockArchiveRepository().getBlockArchiveHeight());
// Ensure the SQL repository contains blocks 2 and 900... // Ensure the file exists
assertNotNull(repository.getBlockRepository().fromHeight(2)); File outputFile = writer.getOutputPath().toFile();
assertNotNull(repository.getBlockRepository().fromHeight(900)); assertTrue(outputFile.exists());
System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
// Prune all the archived blocks // Ensure the SQL repository contains blocks 2 and 900...
int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 900); System.out.println("Verifying that blocks 2 and 900 exist in the repository...");
assertEquals(900-1, numBlocksPruned); assertNotNull(repository.getBlockRepository().fromHeight(2));
repository.getBlockRepository().setBlockPruneHeight(901); assertNotNull(repository.getBlockRepository().fromHeight(900));
System.out.println("Blocks 2 and 900 are present in the repository.");
// Prune the AT states for the archived blocks // Prune all the archived blocks
repository.getATRepository().rebuildLatestAtStates(900); System.out.println("Pruning blocks 2 to 900...");
repository.saveChanges(); int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 900);
int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 900); System.out.println("Number of blocks pruned (Expected 899): " + numBlocksPruned);
assertEquals(900-2, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state assertEquals(900-1, numBlocksPruned);
repository.getATRepository().setAtPruneHeight(901); repository.getBlockRepository().setBlockPruneHeight(901);
// Now ensure the SQL repository is missing blocks 2 and 900... // Prune the AT states for the archived blocks
assertNull(repository.getBlockRepository().fromHeight(2)); System.out.println("Pruning AT states up to height 900...");
assertNull(repository.getBlockRepository().fromHeight(900)); repository.getATRepository().rebuildLatestAtStates(900);
repository.saveChanges();
int numATStatesPruned = repository.getATRepository().pruneAtStates(0, 900);
System.out.println("Number of AT states pruned (Expected 898): " + numATStatesPruned);
assertEquals(900-2, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state
repository.getATRepository().setAtPruneHeight(901);
// ... but it's not missing blocks 1 and 901 (we don't prune the genesis block) // Now ensure the SQL repository is missing blocks 2 and 900...
assertNotNull(repository.getBlockRepository().fromHeight(1)); System.out.println("Verifying that blocks 2 and 900 have been pruned...");
assertNotNull(repository.getBlockRepository().fromHeight(901)); assertNull(repository.getBlockRepository().fromHeight(2));
assertNull(repository.getBlockRepository().fromHeight(900));
System.out.println("Blocks 2 and 900 have been successfully pruned.");
// Validate the latest block height in the repository // ... but it's not missing blocks 1 and 901 (we don't prune the genesis block)
assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight()); System.out.println("Verifying that blocks 1 and 901 still exist...");
assertNotNull(repository.getBlockRepository().fromHeight(1));
assertNotNull(repository.getBlockRepository().fromHeight(901));
System.out.println("Blocks 1 and 901 are present in the repository.");
} // Validate the latest block height in the repository
} int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
assertEquals(1002, lastBlockHeight);
@Test System.out.println("testArchiveAndPrune completed successfully.");
public void testTrimArchivePruneAndOrphan() throws DataException, InterruptedException, TransformationException, IOException { }
try (final Repository repository = RepositoryManager.getRepository()) { }
// Deploy an AT so that we have AT state data @Test
PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice"); public void testTrimArchivePruneAndOrphan() throws DataException, InterruptedException, TransformationException, IOException {
byte[] creationBytes = AtUtils.buildSimpleAT(); try (final Repository repository = RepositoryManager.getRepository()) {
long fundingAmount = 1_00000000L;
AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
// Mint some blocks so that we are able to archive them later System.out.println("Starting testTrimArchivePruneAndOrphan");
for (int i = 0; i < 1000; i++) {
BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
}
// Make sure that block 500 has full AT state data and data hash // Deploy an AT so that we have AT state data
List<ATStateData> block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500); System.out.println("Deploying AT...");
ATStateData atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500); PrivateKeyAccount deployer = Common.getTestAccount(repository, "alice");
assertNotNull(atStatesData.getStateHash()); byte[] creationBytes = AtUtils.buildSimpleAT();
assertNotNull(atStatesData.getStateData()); long fundingAmount = 1_00000000L;
AtUtils.doDeployAT(repository, deployer, creationBytes, fundingAmount);
System.out.println("AT deployed successfully.");
// Trim the first 500 blocks // Mint some blocks so that we are able to archive them later
repository.getBlockRepository().trimOldOnlineAccountsSignatures(0, 500); System.out.println("Minting 1000 blocks...");
repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(501); for (int i = 0; i < 1000; i++) {
repository.getATRepository().rebuildLatestAtStates(500); BlockMinter.mintTestingBlock(repository, Common.getTestAccount(repository, "alice-reward-share"));
repository.getATRepository().trimAtStates(0, 500, 1000); // Log every 100 blocks
repository.getATRepository().setAtTrimHeight(501); if ((i + 1) % 100 == 0) {
System.out.println("Minted block " + (i + 1));
}
}
System.out.println("Finished minting blocks.");
// Now block 499 should only have the AT state data hash // Make sure that block 500 has full AT state data and data hash
List<ATStateData> block499AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(499); System.out.println("Verifying block 500 AT state data...");
atStatesData = repository.getATRepository().getATStateAtHeight(block499AtStatesData.get(0).getATAddress(), 499); List<ATStateData> block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
assertNotNull(atStatesData.getStateHash()); ATStateData atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
assertNull(atStatesData.getStateData()); assertNotNull(atStatesData.getStateHash());
assertNotNull(atStatesData.getStateData());
System.out.println("Block 500 AT state data verified.");
// ... but block 500 should have the full data (due to being retained as the "latest" AT state in the trimmed range // Trim the first 500 blocks
block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500); System.out.println("Trimming first 500 blocks...");
atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500); repository.getBlockRepository().trimOldOnlineAccountsSignatures(0, 500);
assertNotNull(atStatesData.getStateHash()); repository.getBlockRepository().setOnlineAccountsSignaturesTrimHeight(501);
assertNotNull(atStatesData.getStateData()); repository.getATRepository().rebuildLatestAtStates(500);
repository.getATRepository().trimAtStates(0, 500, 1000);
repository.getATRepository().setAtTrimHeight(501);
System.out.println("Trimming completed.");
// ... and block 501 should also have the full data // Now block 499 should only have the AT state data hash
List<ATStateData> block501AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(501); System.out.println("Checking block 499 AT state data...");
atStatesData = repository.getATRepository().getATStateAtHeight(block501AtStatesData.get(0).getATAddress(), 501); List<ATStateData> block499AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(499);
assertNotNull(atStatesData.getStateHash()); atStatesData = repository.getATRepository().getATStateAtHeight(block499AtStatesData.get(0).getATAddress(), 499);
assertNotNull(atStatesData.getStateData()); assertNotNull(atStatesData.getStateHash());
assertNull(atStatesData.getStateData());
System.out.println("Block 499 AT state data contains only state hash as expected.");
// Check the max archive height - this should be one less than the first untrimmed height // ... but block 500 should have the full data (due to being retained as the "latest" AT state in the trimmed range
final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository); System.out.println("Verifying block 500 AT state data again...");
assertEquals(500, maximumArchiveHeight); block500AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(500);
atStatesData = repository.getATRepository().getATStateAtHeight(block500AtStatesData.get(0).getATAddress(), 500);
assertNotNull(atStatesData.getStateHash());
assertNotNull(atStatesData.getStateData());
System.out.println("Block 500 AT state data contains full data.");
BlockData block3DataPreArchive = repository.getBlockRepository().fromHeight(3); // ... and block 501 should also have the full data
System.out.println("Verifying block 501 AT state data...");
List<ATStateData> block501AtStatesData = repository.getATRepository().getBlockATStatesAtHeight(501);
atStatesData = repository.getATRepository().getATStateAtHeight(block501AtStatesData.get(0).getATAddress(), 501);
assertNotNull(atStatesData.getStateHash());
assertNotNull(atStatesData.getStateData());
System.out.println("Block 501 AT state data contains full data.");
// Write blocks 2-500 to the archive // Check the max archive height - this should be one less than the first untrimmed height
BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository); final int maximumArchiveHeight = BlockArchiveWriter.getMaxArchiveHeight(repository);
writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes System.out.println("Maximum archive height determined (Expected 500): " + maximumArchiveHeight);
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write(); assertEquals(500, maximumArchiveHeight);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Make sure that the archive contains the correct number of blocks BlockData block3DataPreArchive = repository.getBlockRepository().fromHeight(3);
assertEquals(500 - 1, writer.getWrittenCount()); // -1 for the genesis block
// Increment block archive height // Write blocks 2-500 to the archive
repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount()); System.out.println("Writing blocks 2 to " + maximumArchiveHeight + " to the archive...");
repository.saveChanges(); BlockArchiveWriter writer = new BlockArchiveWriter(0, maximumArchiveHeight, repository);
assertEquals(500 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight()); writer.setShouldEnforceFileSizeTarget(false); // To avoid the need to pre-calculate file sizes
BlockArchiveWriter.BlockArchiveWriteResult result = writer.write();
System.out.println("Finished writing blocks to archive. Result: " + result);
assertEquals(BlockArchiveWriter.BlockArchiveWriteResult.OK, result);
// Ensure the file exists // Make sure that the archive contains the correct number of blocks
File outputFile = writer.getOutputPath().toFile(); System.out.println("Number of blocks written to archive (Expected 499): " + writer.getWrittenCount());
assertTrue(outputFile.exists()); assertEquals(500 - 1, writer.getWrittenCount()); // -1 for the genesis block
// Ensure the SQL repository contains blocks 2 and 500... // Increment block archive height
assertNotNull(repository.getBlockRepository().fromHeight(2)); repository.getBlockArchiveRepository().setBlockArchiveHeight(writer.getWrittenCount());
assertNotNull(repository.getBlockRepository().fromHeight(500)); repository.saveChanges();
assertEquals(500 - 1, repository.getBlockArchiveRepository().getBlockArchiveHeight());
System.out.println("Block archive height updated to: " + (500 - 1));
// Prune all the archived blocks // Ensure the file exists
int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 500); File outputFile = writer.getOutputPath().toFile();
assertEquals(500-1, numBlocksPruned); assertTrue(outputFile.exists());
repository.getBlockRepository().setBlockPruneHeight(501); System.out.println("Archive file exists at: " + outputFile.getAbsolutePath());
// Prune the AT states for the archived blocks // Ensure the SQL repository contains blocks 2 and 500...
repository.getATRepository().rebuildLatestAtStates(500); System.out.println("Verifying that blocks 2 and 500 exist in the repository...");
repository.saveChanges(); assertNotNull(repository.getBlockRepository().fromHeight(2));
int numATStatesPruned = repository.getATRepository().pruneAtStates(2, 500); assertNotNull(repository.getBlockRepository().fromHeight(500));
assertEquals(498, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state System.out.println("Blocks 2 and 500 are present in the repository.");
repository.getATRepository().setAtPruneHeight(501);
// Now ensure the SQL repository is missing blocks 2 and 500... // Prune all the archived blocks
assertNull(repository.getBlockRepository().fromHeight(2)); System.out.println("Pruning blocks 2 to 500...");
assertNull(repository.getBlockRepository().fromHeight(500)); int numBlocksPruned = repository.getBlockRepository().pruneBlocks(0, 500);
System.out.println("Number of blocks pruned (Expected 499): " + numBlocksPruned);
assertEquals(500-1, numBlocksPruned);
repository.getBlockRepository().setBlockPruneHeight(501);
// ... but it's not missing blocks 1 and 501 (we don't prune the genesis block) // Prune the AT states for the archived blocks
assertNotNull(repository.getBlockRepository().fromHeight(1)); System.out.println("Pruning AT states up to height 500...");
assertNotNull(repository.getBlockRepository().fromHeight(501)); repository.getATRepository().rebuildLatestAtStates(500);
repository.saveChanges();
int numATStatesPruned = repository.getATRepository().pruneAtStates(2, 500);
System.out.println("Number of AT states pruned (Expected 498): " + numATStatesPruned);
assertEquals(498, numATStatesPruned); // Minus 1 for genesis block, and another for the latest AT state
repository.getATRepository().setAtPruneHeight(501);
// Validate the latest block height in the repository // Now ensure the SQL repository is missing blocks 2 and 500...
assertEquals(1002, (int) repository.getBlockRepository().getLastBlock().getHeight()); System.out.println("Verifying that blocks 2 and 500 have been pruned...");
assertNull(repository.getBlockRepository().fromHeight(2));
assertNull(repository.getBlockRepository().fromHeight(500));
System.out.println("Blocks 2 and 500 have been successfully pruned.");
// Now orphan some unarchived blocks. // ... but it's not missing blocks 1 and 501 (we don't prune the genesis block)
BlockUtils.orphanBlocks(repository, 500); System.out.println("Verifying that blocks 1 and 501 still exist...");
assertEquals(502, (int) repository.getBlockRepository().getLastBlock().getHeight()); assertNotNull(repository.getBlockRepository().fromHeight(1));
assertNotNull(repository.getBlockRepository().fromHeight(501));
System.out.println("Blocks 1 and 501 are present in the repository.");
// We're close to the lower limit of the SQL database now, so // Validate the latest block height in the repository
// we need to import some blocks from the archive int lastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
BlockArchiveUtils.importFromArchive(401, 500, repository); System.out.println("Latest block height in repository (Expected 1002): " + lastBlockHeight);
assertEquals(1002, lastBlockHeight);
// Ensure the SQL repository now contains block 401 but not 400... // Now orphan some unarchived blocks.
assertNotNull(repository.getBlockRepository().fromHeight(401)); System.out.println("Orphaning 500 blocks...");
assertNull(repository.getBlockRepository().fromHeight(400)); BlockUtils.orphanBlocks(repository, 500);
int currentLastBlockHeight = repository.getBlockRepository().getLastBlock().getHeight();
System.out.println("New last block height after orphaning (Expected 502): " + currentLastBlockHeight);
assertEquals(502, currentLastBlockHeight);
// Import the remaining 399 blocks // We're close to the lower limit of the SQL database now, so
BlockArchiveUtils.importFromArchive(2, 400, repository); // we need to import some blocks from the archive
System.out.println("Importing blocks 401 to 500 from the archive...");
BlockArchiveUtils.importFromArchive(401, 500, repository);
// Verify that block 3 matches the original // Ensure the SQL repository now contains block 401 but not 400...
BlockData block3DataPostArchive = repository.getBlockRepository().fromHeight(3); System.out.println("Verifying that block 401 exists and block 400 does not...");
assertArrayEquals(block3DataPreArchive.getSignature(), block3DataPostArchive.getSignature()); assertNotNull(repository.getBlockRepository().fromHeight(401));
assertEquals(block3DataPreArchive.getHeight(), block3DataPostArchive.getHeight()); assertNull(repository.getBlockRepository().fromHeight(400));
System.out.println("Block 401 exists, block 400 does not.");
// Orphan 2 more block, which should be the last one that is possible to be orphaned // Import the remaining 399 blocks
System.out.println("Importing blocks 2 to 400 from the archive...");
BlockArchiveUtils.importFromArchive(2, 400, repository);
// Verify that block 3 matches the original
System.out.println("Verifying that block 3 matches the original data...");
BlockData block3DataPostArchive = repository.getBlockRepository().fromHeight(3);
assertArrayEquals(block3DataPreArchive.getSignature(), block3DataPostArchive.getSignature());
assertEquals(block3DataPreArchive.getHeight(), block3DataPostArchive.getHeight());
System.out.println("Block 3 data matches the original.");
// Orphan 2 more block, which should be the last one that is possible to be orphaned
// TODO: figure out why this is 1 block more than in the equivalent block archive V1 test // TODO: figure out why this is 1 block more than in the equivalent block archive V1 test
BlockUtils.orphanBlocks(repository, 2); System.out.println("Orphaning 2 more blocks...");
BlockUtils.orphanBlocks(repository, 2);
System.out.println("Orphaned 2 blocks successfully.");
// Orphan another block, which should fail // Orphan another block, which should fail
Exception exception = null; System.out.println("Attempting to orphan another block, which should fail...");
try { Exception exception = null;
BlockUtils.orphanBlocks(repository, 1); try {
} catch (DataException e) { BlockUtils.orphanBlocks(repository, 1);
exception = e; } catch (DataException e) {
} exception = e;
System.out.println("Caught expected DataException: " + e.getMessage());
}
// Ensure that a DataException is thrown because there is no more AT states data available // Ensure that a DataException is thrown because there is no more AT states data available
assertNotNull(exception); assertNotNull(exception);
assertEquals(DataException.class, exception.getClass()); assertEquals(DataException.class, exception.getClass());
System.out.println("DataException confirmed due to lack of AT states data.");
// FUTURE: we may be able to retain unique AT states when trimming, to avoid this exception // FUTURE: we may be able to retain unique AT states when trimming, to avoid this exception
// and allow orphaning back through blocks with trimmed AT states. // and allow orphaning back through blocks with trimmed AT states.
} System.out.println("testTrimArchivePruneAndOrphan completed successfully.");
} }
}
/** /**
* Many nodes are missing an ATStatesHeightIndex due to an earlier bug * Many nodes are missing an ATStatesHeightIndex due to an earlier bug
* In these cases we disable archiving and pruning as this index is a * In these cases we disable archiving and pruning as this index is a
* very essential component in these processes. * very essential component in these processes.
*/ */
@Test @Test
public void testMissingAtStatesHeightIndex() throws DataException, SQLException { public void testMissingAtStatesHeightIndex() throws DataException, SQLException {
try (final HSQLDBRepository repository = (HSQLDBRepository) RepositoryManager.getRepository()) { try (final HSQLDBRepository repository = (HSQLDBRepository) RepositoryManager.getRepository()) {
// Firstly check that we're able to prune or archive when the index exists System.out.println("Starting testMissingAtStatesHeightIndex");
assertTrue(repository.getATRepository().hasAtStatesHeightIndex());
assertTrue(RepositoryManager.canArchiveOrPrune());
// Delete the index // Firstly check that we're able to prune or archive when the index exists
repository.prepareStatement("DROP INDEX ATSTATESHEIGHTINDEX").execute(); System.out.println("Checking existence of ATStatesHeightIndex...");
assertTrue(repository.getATRepository().hasAtStatesHeightIndex());
assertTrue(RepositoryManager.canArchiveOrPrune());
System.out.println("ATStatesHeightIndex exists. Archiving and pruning are possible.");
// Ensure check that we're unable to prune or archive when the index doesn't exist // Delete the index
assertFalse(repository.getATRepository().hasAtStatesHeightIndex()); System.out.println("Dropping ATStatesHeightIndex...");
assertFalse(RepositoryManager.canArchiveOrPrune()); repository.prepareStatement("DROP INDEX ATSTATESHEIGHTINDEX").execute();
} System.out.println("ATStatesHeightIndex dropped.");
}
// Ensure check that we're unable to prune or archive when the index doesn't exist
System.out.println("Verifying that ATStatesHeightIndex no longer exists...");
assertFalse(repository.getATRepository().hasAtStatesHeightIndex());
assertFalse(RepositoryManager.canArchiveOrPrune());
System.out.println("ATStatesHeightIndex does not exist. Archiving and pruning are disabled.");
System.out.println("testMissingAtStatesHeightIndex completed successfully.");
}
}
private void deleteArchiveDirectory() { private void deleteArchiveDirectory() {
// Delete archive directory if exists // Delete archive directory if exists
Path archivePath = Paths.get(Settings.getInstance().getRepositoryPath(), "archive").toAbsolutePath(); Path archivePath = Paths.get(Settings.getInstance().getRepositoryPath(), "archive").toAbsolutePath();
try { try {
FileUtils.deleteDirectory(archivePath.toFile()); FileUtils.deleteDirectory(archivePath.toFile());
} catch (IOException e) { System.out.println("Deleted archive directory at: " + archivePath);
} catch (IOException e) {
} System.out.println("Failed to delete archive directory: " + e.getMessage());
} }
}
} }