From 8dac3ebf96235363481086011bcef96012a38525 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 14 Aug 2021 14:05:33 +0100
Subject: [PATCH] More miscellaneous refactoring

---
 .../java/org/qortal/arbitrary/ArbitraryDataFile.java   |  6 +++---
 .../java/org/qortal/arbitrary/ArbitraryDataReader.java |  6 +++---
 .../org/qortal/controller/ArbitraryDataManager.java    | 10 +++++-----
 .../repository/hsqldb/HSQLDBArbitraryRepository.java   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java
index 9cce4879..4b91219e 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataFile.java
@@ -119,7 +119,7 @@ public class ArbitraryDataFile {
                 return arbitraryDataFile;
 
             } catch (IOException e) {
-                LOGGER.error("Couldn't compute digest for DataFile");
+                LOGGER.error("Couldn't compute digest for ArbitraryDataFile");
             }
         }
         return null;
@@ -187,7 +187,7 @@ public class ArbitraryDataFile {
             // Validate the file size
             long fileSize = Files.size(path);
             if (fileSize > MAX_FILE_SIZE) {
-                LOGGER.error(String.format("DataFile is too large: %d bytes (max size: %d bytes)", fileSize, MAX_FILE_SIZE));
+                LOGGER.error(String.format("ArbitraryDataFile is too large: %d bytes (max size: %d bytes)", fileSize, MAX_FILE_SIZE));
                 return ArbitraryDataFile.ValidationResult.FILE_TOO_LARGE;
             }
 
@@ -468,7 +468,7 @@ public class ArbitraryDataFile {
                 return Crypto.digest(fileContent);
 
             } catch (IOException e) {
-                LOGGER.error("Couldn't compute digest for DataFile");
+                LOGGER.error("Couldn't compute digest for ArbitraryDataFile");
             }
         }
         return null;
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
index 3fb2c44d..219d2293 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataReader.java
@@ -166,7 +166,7 @@ public class ArbitraryDataReader {
     private void fetchFromFileHash() {
         // Load data file directly from the hash
         ArbitraryDataFile arbitraryDataFile = ArbitraryDataFile.fromHash58(resourceId);
-        // Set filePath to the location of the DataFile
+        // Set filePath to the location of the ArbitraryDataFile
         this.filePath = Paths.get(arbitraryDataFile.getFilePath());
     }
 
@@ -233,7 +233,7 @@ public class ArbitraryDataReader {
         if (!Arrays.equals(arbitraryDataFile.digest(), digest)) {
             throw new IllegalStateException("Unable to validate complete file hash");
         }
-        // Set filePath to the location of the DataFile
+        // Set filePath to the location of the ArbitraryDataFile
         this.filePath = Paths.get(arbitraryDataFile.getFilePath());
     }
 
@@ -247,7 +247,7 @@ public class ArbitraryDataReader {
                 AES.decryptFile("AES", aesKey, this.filePath.toString(), this.unencryptedPath.toString());
 
                 // Replace filePath pointer with the encrypted file path
-                // Don't delete the original DataFile, as this is handled in the cleanup phase
+                // Don't delete the original ArbitraryDataFile, as this is handled in the cleanup phase
                 this.filePath = this.unencryptedPath;
 
             } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | NoSuchPaddingException
diff --git a/src/main/java/org/qortal/controller/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
index 1d53be7f..bf7c4632 100644
--- a/src/main/java/org/qortal/controller/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/ArbitraryDataManager.java
@@ -370,13 +370,13 @@ public class ArbitraryDataManager extends Thread {
 				ArbitraryDataFile arbitraryDataFile = ArbitraryDataFile.fromHash(hash);
 				if (chunkHashes != null && chunkHashes.length > 0) {
 					arbitraryDataFile.addChunkHashes(chunkHashes);
-					for (ArbitraryDataFileChunk dataFileChunk : arbitraryDataFile.getChunks()) {
-						if (dataFileChunk.exists()) {
-							hashes.add(dataFileChunk.getHash());
-							//LOGGER.info("Added hash {}", dataFileChunk.getHash58());
+					for (ArbitraryDataFileChunk chunk : arbitraryDataFile.getChunks()) {
+						if (chunk.exists()) {
+							hashes.add(chunk.getHash());
+							//LOGGER.info("Added hash {}", chunk.getHash58());
 						}
 						else {
-							LOGGER.info("Couldn't add hash {} because it doesn't exist", dataFileChunk.getHash58());
+							LOGGER.info("Couldn't add hash {} because it doesn't exist", chunk.getHash58());
 						}
 					}
 				}
diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java
index 29c0326d..42321584 100644
--- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java
+++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java
@@ -133,7 +133,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
 		arbitraryTransactionData.setData(dataHash);
 		arbitraryTransactionData.setDataType(DataType.DATA_HASH);
 
-		// Create DataFile
+		// Create ArbitraryDataFile
 		ArbitraryDataFile arbitraryDataFile = new ArbitraryDataFile(rawData);
 
 		// Verify that the data file is valid, and that it matches the expected hash