From 62878602b58db0e2f2e7a9bb940b0f87dcd06403 Mon Sep 17 00:00:00 2001
From: Carsten Otto <git@c-otto.de>
Date: Sat, 18 Dec 2021 15:22:02 +0100
Subject: [PATCH] move method down

---
 .../lndmanagej/grpc/GrpcChannelsBase.java     |  7 -----
 .../lndmanagej/grpc/GrpcClosedChannels.java   |  7 +++++
 .../lndmanagej/grpc/GrpcChannelsBaseTest.java | 17 -----------
 .../grpc/GrpcClosedChannelsTest.java          | 28 +++++++++++++++++++
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcChannelsBase.java b/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcChannelsBase.java
index 3edaec80..8ebcfcb2 100644
--- a/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcChannelsBase.java
+++ b/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcChannelsBase.java
@@ -30,13 +30,6 @@ public class GrpcChannelsBase {
         throw new IllegalStateException("unexpected open initiator: " + openInitiator);
     }
 
-    Optional<ChannelId> getChannelId(long chanId, ChannelPoint channelPoint) {
-        if (chanId == 0) {
-            return resolveChannelId(channelPoint);
-        }
-        return Optional.of(ChannelId.fromShortChannelId(chanId));
-    }
-
     Optional<ChannelId> resolveChannelId(ChannelPoint channelPoint) {
         return channelIdResolver.resolveFromChannelPoint(channelPoint);
     }
diff --git a/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcClosedChannels.java b/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcClosedChannels.java
index ee6d0be4..0af292c5 100644
--- a/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcClosedChannels.java
+++ b/grpc-adapter/src/main/java/de/cotto/lndmanagej/grpc/GrpcClosedChannels.java
@@ -140,4 +140,11 @@ public class GrpcClosedChannels extends GrpcChannelsBase {
         }
         throw new IllegalStateException("unexpected close initiator: " + closeInitiator);
     }
+
+    private Optional<ChannelId> getChannelId(long chanId, ChannelPoint channelPoint) {
+        if (chanId == 0) {
+            return resolveChannelId(channelPoint);
+        }
+        return Optional.of(ChannelId.fromShortChannelId(chanId));
+    }
 }
diff --git a/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcChannelsBaseTest.java b/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcChannelsBaseTest.java
index e8b63698..796a9982 100644
--- a/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcChannelsBaseTest.java
+++ b/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcChannelsBaseTest.java
@@ -43,23 +43,6 @@ class GrpcChannelsBaseTest {
         assertThat(grpcChannelsBase.getOpenInitiator(Initiator.INITIATOR_REMOTE)).isEqualTo(OpenInitiator.REMOTE);
     }
 
-    @Test
-    void getChannelId_already_resolved() {
-        assertThat(grpcChannelsBase.getChannelId(CHANNEL_ID.getShortChannelId(), CHANNEL_POINT)).contains(CHANNEL_ID);
-        verify(channelIdResolver, never()).resolveFromChannelPoint(any());
-    }
-
-    @Test
-    void getChannelId_resolved() {
-        when(channelIdResolver.resolveFromChannelPoint(CHANNEL_POINT)).thenReturn(Optional.of(CHANNEL_ID_2));
-        assertThat(grpcChannelsBase.getChannelId(0, CHANNEL_POINT)).contains(CHANNEL_ID_2);
-    }
-
-    @Test
-    void getChannelId_not_resolved() {
-        assertThat(grpcChannelsBase.getChannelId(0, CHANNEL_POINT)).isEmpty();
-    }
-
     @Test
     void resolveChannelId_resolved() {
         when(channelIdResolver.resolveFromChannelPoint(CHANNEL_POINT)).thenReturn(Optional.of(CHANNEL_ID_2));
diff --git a/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcClosedChannelsTest.java b/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcClosedChannelsTest.java
index b549fc2c..b90b4a87 100644
--- a/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcClosedChannelsTest.java
+++ b/grpc-adapter/src/test/java/de/cotto/lndmanagej/grpc/GrpcClosedChannelsTest.java
@@ -1,6 +1,7 @@
 package de.cotto.lndmanagej.grpc;
 
 import de.cotto.lndmanagej.hardcoded.HardcodedService;
+import de.cotto.lndmanagej.model.Channel;
 import de.cotto.lndmanagej.model.ChannelIdResolver;
 import de.cotto.lndmanagej.model.CloseInitiator;
 import de.cotto.lndmanagej.model.ClosedChannelFixtures;
@@ -222,6 +223,33 @@ class GrpcClosedChannelsTest {
         verify(channelIdResolver, never()).resolveFromChannelPoint(any());
     }
 
+    @Test
+    void getChannelId_already_resolved() {
+        when(grpcService.getClosedChannels()).thenReturn(List.of(
+                closedChannel(CHANNEL_ID_SHORT, COOPERATIVE_CLOSE, INITIATOR_LOCAL, INITIATOR_REMOTE)
+        ));
+        assertThat(grpcClosedChannels.getClosedChannels()).map(Channel::getId).containsExactly(CHANNEL_ID);
+        verify(channelIdResolver, never()).resolveFromChannelPoint(any());
+    }
+
+    @Test
+    void getChannelId_resolved() {
+        when(grpcService.getClosedChannels()).thenReturn(List.of(
+                closedChannel(0, COOPERATIVE_CLOSE, INITIATOR_LOCAL, INITIATOR_REMOTE)
+        ));
+        when(channelIdResolver.resolveFromChannelPoint(CHANNEL_POINT)).thenReturn(Optional.of(CHANNEL_ID_2));
+        assertThat(grpcClosedChannels.getClosedChannels()).map(Channel::getId).containsExactly(CHANNEL_ID_2);
+    }
+
+    @Test
+    void getChannelId_not_resolved() {
+        when(grpcService.getClosedChannels()).thenReturn(List.of(
+                closedChannel(0, COOPERATIVE_CLOSE, INITIATOR_LOCAL, INITIATOR_REMOTE)
+        ));
+        assertThat(grpcClosedChannels.getClosedChannels()).isEmpty();
+    }
+
+
     private ChannelCloseSummary closedChannel(
             long channelId,
             ChannelCloseSummary.ClosureType closeType,