From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 30 Jul 2019 20:12:06 +0000 (+0200)
Subject: 🔥 Remove fetching of custom edition from rescuer
X-Git-Tag: v81^2~150
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c5734598ee88c40467f586de702a67ccabd0af92;p=Sone.git

🔥 Remove fetching of custom edition from rescuer
---

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
index 4d706ca..93c77c2 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
@@ -158,7 +158,7 @@ public class SoneRescuer extends AbstractService {
 			}
 			if (fetching) {
 				core.lockSone(sone);
-				FreenetURI soneUri = sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + currentEdition).setMetaString(new String[] { "sone.xml" });
+				FreenetURI soneUri = sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + getNextEdition()).setMetaString(new String[] { "sone.xml" });
 				System.out.println("URI: " + soneUri);
 				Sone fetchedSone = soneDownloader.fetchSone(sone, soneUri, true);
 				System.out.println("Sone: " + fetchedSone);
diff --git a/src/test/java/net/pterodactylus/sone/core/SoneRescuerTest.java b/src/test/java/net/pterodactylus/sone/core/SoneRescuerTest.java
index ff49a4c..92748e8 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneRescuerTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneRescuerTest.java
@@ -25,7 +25,6 @@ import org.mockito.stubbing.Answer;
 public class SoneRescuerTest {
 
 	private static final long CURRENT_EDITION = 12L;
-	private static final long SOME_OTHER_EDITION = 15L;
 	private final Core core = mock(Core.class);
 	private final SoneDownloader soneDownloader = mock(SoneDownloader.class);
 	private final Sone sone = mock(Sone.class);
@@ -71,12 +70,6 @@ public class SoneRescuerTest {
 	}
 
 	@Test
-	public void currentEditionCanBeSet() {
-		soneRescuer.setEdition(SOME_OTHER_EDITION);
-		assertThat(soneRescuer.getCurrentEdition(), is(SOME_OTHER_EDITION));
-	}
-
-	@Test
 	public void lastFetchOfANewSoneRescuerWasSuccessful() {
 		assertThat(soneRescuer.isLastFetchSuccessful(), is(true));
 	}
@@ -126,7 +119,7 @@ public class SoneRescuerTest {
 		FreenetURI keyWithDocName = mock(FreenetURI.class);
 		FreenetURI keyWithMetaStrings = mock(FreenetURI.class);
 		when(keyWithDocName.setMetaString(eq(new String[] { "sone.xml" }))).thenReturn(keyWithMetaStrings);
-		when(sskKey.setDocName(eq("Sone-" + CURRENT_EDITION))).thenReturn(keyWithDocName);
+		when(sskKey.setDocName(eq("Sone-" + (CURRENT_EDITION - 1)))).thenReturn(keyWithDocName);
 		when(sone.getRequestUri().setKeyType(eq("SSK"))).thenReturn(sskKey);
 		return keyWithMetaStrings;
 	}