diff --git a/model/src/main/java/de/cotto/lndmanagej/model/ChannelId.java b/model/src/main/java/de/cotto/lndmanagej/model/ChannelId.java index 459f93f3..d8771f95 100644 --- a/model/src/main/java/de/cotto/lndmanagej/model/ChannelId.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/ChannelId.java @@ -5,7 +5,6 @@ import java.util.Objects; public final class ChannelId implements Comparable { private static final int EXPECTED_NUMBER_OF_SEGMENTS = 3; - private static final long NOT_BEFORE = 430_103_660_018_532_352L; // January 1st 2016 private final long shortChannelId; @@ -14,7 +13,7 @@ public final class ChannelId implements Comparable { } public static ChannelId fromShortChannelId(long shortChannelId) { - if (shortChannelId < NOT_BEFORE) { + if (shortChannelId <= 0) { throw new IllegalArgumentException("Illegal channel ID " + shortChannelId); } return new ChannelId(shortChannelId); diff --git a/model/src/test/java/de/cotto/lndmanagej/model/ChannelIdTest.java b/model/src/test/java/de/cotto/lndmanagej/model/ChannelIdTest.java index abd6abea..512889bb 100644 --- a/model/src/test/java/de/cotto/lndmanagej/model/ChannelIdTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/ChannelIdTest.java @@ -25,9 +25,9 @@ class ChannelIdTest { } @Test - void before_2016() { + void zero_id() { assertThatIllegalArgumentException().isThrownBy( - () -> ChannelId.fromCompactForm("391176:999:999") + () -> ChannelId.fromCompactForm("0:0:0") ).withMessageStartingWith(ILLEGAL_CHANNEL_ID); } @@ -81,9 +81,9 @@ class ChannelIdTest { } @Test - void before_2016() { + void zero_id() { assertThatIllegalArgumentException().isThrownBy( - () -> ChannelId.fromShortChannelId(430_103_660_018_532_351L) + () -> ChannelId.fromShortChannelId(0) ).withMessageStartingWith(ILLEGAL_CHANNEL_ID); } @@ -151,4 +151,4 @@ class ChannelIdTest { void testToString() { assertThat(CHANNEL_ID).hasToString(CHANNEL_ID.getCompactForm()); } -} \ No newline at end of file +} diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java index 9add36ed..387a2068 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/ChannelIdConverterTest.java @@ -63,13 +63,8 @@ class ChannelIdConverterTest { } @Test - void just_numbers_small_number() { - assertThat(channelIdConverter.tryToConvert("123")).isEmpty(); - } - - @Test - void just_numbers_too_early() { - assertThat(channelIdConverter.tryToConvert("430103660018532351")).isEmpty(); + void just_numbers_zero() { + assertThat(channelIdConverter.tryToConvert("0")).isEmpty(); } @Test @@ -78,8 +73,8 @@ class ChannelIdConverterTest { } @Test - void compact_form_too_early() { - assertThat(channelIdConverter.tryToConvert("300000x123x1")).isEmpty(); + void compact_form_zero() { + assertThat(channelIdConverter.tryToConvert("0x0x0")).isEmpty(); } @Test @@ -88,8 +83,8 @@ class ChannelIdConverterTest { } @Test - void compact_lnd_form_too_early() { - assertThat(channelIdConverter.tryToConvert("300000:123:1")).isEmpty(); + void compact_lnd_form_zero() { + assertThat(channelIdConverter.tryToConvert("0:0:0")).isEmpty(); } @Test