From dc030a42bbd94abaf1f7357b583cc31eb03b415c Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 25 Aug 2021 18:57:04 +0100
Subject: [PATCH] Moved trimming and pruning classes into a single package
 (org.qortal.controller.repository)

---
 src/main/java/org/qortal/controller/Controller.java           | 2 --
 .../controller/{pruning => repository}/AtStatesPruner.java    | 2 +-
 .../qortal/controller/{ => repository}/AtStatesTrimmer.java   | 4 ++--
 .../controller/{pruning => repository}/BlockPruner.java       | 2 +-
 .../{ => repository}/OnlineAccountsSignaturesTrimmer.java     | 3 ++-
 .../controller/{pruning => repository}/PruneManager.java      | 4 +---
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename src/main/java/org/qortal/controller/{pruning => repository}/AtStatesPruner.java (98%)
 rename src/main/java/org/qortal/controller/{ => repository}/AtStatesTrimmer.java (97%)
 rename src/main/java/org/qortal/controller/{pruning => repository}/BlockPruner.java (98%)
 rename src/main/java/org/qortal/controller/{ => repository}/OnlineAccountsSignaturesTrimmer.java (97%)
 rename src/main/java/org/qortal/controller/{pruning => repository}/PruneManager.java (95%)

diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index 474e4498..9810fade 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -24,7 +24,6 @@ import java.util.Properties;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
@@ -97,7 +96,6 @@ import org.qortal.transaction.Transaction.TransactionType;
 import org.qortal.transaction.Transaction.ValidationResult;
 import org.qortal.utils.Base58;
 import org.qortal.utils.ByteArray;
-import org.qortal.utils.DaemonThreadFactory;
 import org.qortal.utils.NTP;
 import org.qortal.utils.Triple;
 
diff --git a/src/main/java/org/qortal/controller/pruning/AtStatesPruner.java b/src/main/java/org/qortal/controller/repository/AtStatesPruner.java
similarity index 98%
rename from src/main/java/org/qortal/controller/pruning/AtStatesPruner.java
rename to src/main/java/org/qortal/controller/repository/AtStatesPruner.java
index 66325e88..30d7f136 100644
--- a/src/main/java/org/qortal/controller/pruning/AtStatesPruner.java
+++ b/src/main/java/org/qortal/controller/repository/AtStatesPruner.java
@@ -1,4 +1,4 @@
-package org.qortal.controller.pruning;
+package org.qortal.controller.repository;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/org/qortal/controller/AtStatesTrimmer.java b/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java
similarity index 97%
rename from src/main/java/org/qortal/controller/AtStatesTrimmer.java
rename to src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java
index 4b08e5ca..ed02ee47 100644
--- a/src/main/java/org/qortal/controller/AtStatesTrimmer.java
+++ b/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java
@@ -1,8 +1,8 @@
-package org.qortal.controller;
+package org.qortal.controller.repository;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.qortal.controller.pruning.PruneManager;
+import org.qortal.controller.Controller;
 import org.qortal.data.block.BlockData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
diff --git a/src/main/java/org/qortal/controller/pruning/BlockPruner.java b/src/main/java/org/qortal/controller/repository/BlockPruner.java
similarity index 98%
rename from src/main/java/org/qortal/controller/pruning/BlockPruner.java
rename to src/main/java/org/qortal/controller/repository/BlockPruner.java
index 8ae25224..6d3180a8 100644
--- a/src/main/java/org/qortal/controller/pruning/BlockPruner.java
+++ b/src/main/java/org/qortal/controller/repository/BlockPruner.java
@@ -1,4 +1,4 @@
-package org.qortal.controller.pruning;
+package org.qortal.controller.repository;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/org/qortal/controller/OnlineAccountsSignaturesTrimmer.java b/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java
similarity index 97%
rename from src/main/java/org/qortal/controller/OnlineAccountsSignaturesTrimmer.java
rename to src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java
index b32a2b06..c7f248d5 100644
--- a/src/main/java/org/qortal/controller/OnlineAccountsSignaturesTrimmer.java
+++ b/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java
@@ -1,8 +1,9 @@
-package org.qortal.controller;
+package org.qortal.controller.repository;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.qortal.block.BlockChain;
+import org.qortal.controller.Controller;
 import org.qortal.data.block.BlockData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
diff --git a/src/main/java/org/qortal/controller/pruning/PruneManager.java b/src/main/java/org/qortal/controller/repository/PruneManager.java
similarity index 95%
rename from src/main/java/org/qortal/controller/pruning/PruneManager.java
rename to src/main/java/org/qortal/controller/repository/PruneManager.java
index b733833b..5f92c75d 100644
--- a/src/main/java/org/qortal/controller/pruning/PruneManager.java
+++ b/src/main/java/org/qortal/controller/repository/PruneManager.java
@@ -1,9 +1,7 @@
-package org.qortal.controller.pruning;
+package org.qortal.controller.repository;
 
-import org.qortal.controller.AtStatesTrimmer;
 import org.qortal.controller.Controller;
 
-import org.qortal.controller.OnlineAccountsSignaturesTrimmer;
 import org.qortal.data.block.BlockData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;