From 5ba6f6f53ef00fdfd1ed406f1a111509d1a14a96 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 9 Jan 2022 13:25:49 +0000 Subject: [PATCH] FOLLOWED_AND_VIEWED renamed to FOLLOWED_OR_VIEWED, since it's technically an OR not an AND. --- .../qortal/controller/arbitrary/ArbitraryDataManager.java | 2 +- .../controller/arbitrary/ArbitraryDataStorageManager.java | 8 ++++---- .../test/arbitrary/ArbitraryDataStoragePolicyTests.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java index a0ef02bb..e968d64c 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java @@ -102,7 +102,7 @@ public class ArbitraryDataManager extends Thread { // Fetch data according to storage policy switch (Settings.getInstance().getStoragePolicy()) { case FOLLOWED: - case FOLLOWED_AND_VIEWED: + case FOLLOWED_OR_VIEWED: this.processNames(); break; diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java index bd686355..c95b0694 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; public class ArbitraryDataStorageManager extends Thread { public enum StoragePolicy { - FOLLOWED_AND_VIEWED, + FOLLOWED_OR_VIEWED, FOLLOWED, VIEWED, ALL, @@ -126,7 +126,7 @@ public class ArbitraryDataStorageManager extends Thread { // Check if our storage policy and and lists allow us to host data for this name switch (Settings.getInstance().getStoragePolicy()) { - case FOLLOWED_AND_VIEWED: + case FOLLOWED_OR_VIEWED: case ALL: case VIEWED: // If the policy includes viewed data, we can host it as long as it's not blocked @@ -189,7 +189,7 @@ public class ArbitraryDataStorageManager extends Thread { switch (Settings.getInstance().getStoragePolicy()) { case FOLLOWED: - case FOLLOWED_AND_VIEWED: + case FOLLOWED_OR_VIEWED: return this.isFollowingName(name); case ALL: @@ -217,7 +217,7 @@ public class ArbitraryDataStorageManager extends Thread { case NONE: case VIEWED: case FOLLOWED: - case FOLLOWED_AND_VIEWED: + case FOLLOWED_OR_VIEWED: default: return false; } diff --git a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java index 5c88956e..30abc9f5 100644 --- a/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java +++ b/src/test/java/org/qortal/test/arbitrary/ArbitraryDataStoragePolicyTests.java @@ -68,7 +68,7 @@ public class ArbitraryDataStoragePolicyTests extends Common { assertTrue(ResourceListManager.getInstance().addToList("followedNames", name, false)); // We should store and pre-fetch data for this transaction - assertEquals(StoragePolicy.FOLLOWED_AND_VIEWED, Settings.getInstance().getStoragePolicy()); + assertEquals(StoragePolicy.FOLLOWED_OR_VIEWED, Settings.getInstance().getStoragePolicy()); assertTrue(storageManager.canStoreData(transactionData)); assertTrue(storageManager.shouldPreFetchData(repository, transactionData));