diff --git a/balances/src/test/java/de/cotto/lndmanagej/balances/persistence/BalancesIdTest.java b/balances/src/test/java/de/cotto/lndmanagej/balances/persistence/BalancesIdTest.java index d8b88db2..5efe5b78 100644 --- a/balances/src/test/java/de/cotto/lndmanagej/balances/persistence/BalancesIdTest.java +++ b/balances/src/test/java/de/cotto/lndmanagej/balances/persistence/BalancesIdTest.java @@ -1,18 +1,19 @@ package de.cotto.lndmanagej.balances.persistence; import nl.jqno.equalsverifier.EqualsVerifier; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + class BalancesIdTest { @Test void test_default_constructor() { // required for JPA - Assertions.assertThat(new BalancesId()).isNotNull(); + assertThat(new BalancesId()).isNotNull(); } @Test void testEquals() { EqualsVerifier.simple().forClass(BalancesId.class).usingGetClass().verify(); } -} \ No newline at end of file +} diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoute.java b/model/src/main/java/de/cotto/lndmanagej/model/BasicRoute.java similarity index 65% rename from pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoute.java rename to model/src/main/java/de/cotto/lndmanagej/model/BasicRoute.java index 6b5e698d..200abbfa 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoute.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/BasicRoute.java @@ -1,7 +1,4 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Edge; +package de.cotto.lndmanagej.model; import java.util.List; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformation.java b/model/src/main/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformation.java similarity index 87% rename from pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformation.java rename to model/src/main/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformation.java index 75031984..f4720fab 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformation.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformation.java @@ -1,10 +1,4 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import de.cotto.lndmanagej.model.ChannelId; -import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Edge; -import de.cotto.lndmanagej.model.Policy; -import de.cotto.lndmanagej.model.Pubkey; +package de.cotto.lndmanagej.model; public record EdgeWithLiquidityInformation( Edge edge, diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Route.java b/model/src/main/java/de/cotto/lndmanagej/model/Route.java similarity index 97% rename from pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Route.java rename to model/src/main/java/de/cotto/lndmanagej/model/Route.java index 7eb4ad21..101884a6 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Route.java +++ b/model/src/main/java/de/cotto/lndmanagej/model/Route.java @@ -1,7 +1,4 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Edge; +package de.cotto.lndmanagej.model; import java.util.ArrayList; import java.util.List; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteTest.java b/model/src/test/java/de/cotto/lndmanagej/model/BasicRouteTest.java similarity index 83% rename from pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteTest.java rename to model/src/test/java/de/cotto/lndmanagej/model/BasicRouteTest.java index 3f0dc9f9..0d1cc364 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/BasicRouteTest.java @@ -1,14 +1,13 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; +package de.cotto.lndmanagej.model; -import de.cotto.lndmanagej.model.Coins; import org.junit.jupiter.api.Test; import java.util.List; +import static de.cotto.lndmanagej.model.BasicRouteFixtures.BASIC_ROUTE; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE_2_3; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE_3_4; -import static de.cotto.lndmanagej.pickhardtpayments.model.BasicRouteFixtures.BASIC_ROUTE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationTest.java b/model/src/test/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationTest.java similarity index 93% rename from pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationTest.java rename to model/src/test/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationTest.java index 5c6a6b18..de8e9ba6 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationTest.java @@ -1,10 +1,9 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; +package de.cotto.lndmanagej.model; -import de.cotto.lndmanagej.model.Coins; import org.junit.jupiter.api.Test; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE; -import static de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformationFixtures.EDGE_WITH_LIQUIDITY_INFORMATION; +import static de.cotto.lndmanagej.model.EdgeWithLiquidityInformationFixtures.EDGE_WITH_LIQUIDITY_INFORMATION; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteTest.java b/model/src/test/java/de/cotto/lndmanagej/model/RouteTest.java similarity index 98% rename from pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteTest.java rename to model/src/test/java/de/cotto/lndmanagej/model/RouteTest.java index 1d0106ac..2090820c 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteTest.java +++ b/model/src/test/java/de/cotto/lndmanagej/model/RouteTest.java @@ -1,8 +1,5 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; +package de.cotto.lndmanagej.model; -import de.cotto.lndmanagej.model.Coins; -import de.cotto.lndmanagej.model.Edge; -import de.cotto.lndmanagej.model.Policy; import nl.jqno.equalsverifier.EqualsVerifier; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; @@ -10,6 +7,7 @@ import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; +import static de.cotto.lndmanagej.model.BasicRouteFixtures.BASIC_ROUTE; import static de.cotto.lndmanagej.model.ChannelFixtures.CAPACITY; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_2; @@ -22,8 +20,7 @@ import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_3; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_4; -import static de.cotto.lndmanagej.pickhardtpayments.model.BasicRouteFixtures.BASIC_ROUTE; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteFixtures.java b/model/src/testFixtures/java/de/cotto/lndmanagej/model/BasicRouteFixtures.java similarity index 85% rename from pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteFixtures.java rename to model/src/testFixtures/java/de/cotto/lndmanagej/model/BasicRouteFixtures.java index a113fd5d..c2411175 100644 --- a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRouteFixtures.java +++ b/model/src/testFixtures/java/de/cotto/lndmanagej/model/BasicRouteFixtures.java @@ -1,6 +1,4 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import de.cotto.lndmanagej.model.Coins; +package de.cotto.lndmanagej.model; import java.util.List; diff --git a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationFixtures.java b/model/src/testFixtures/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationFixtures.java similarity index 75% rename from pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationFixtures.java rename to model/src/testFixtures/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationFixtures.java index 46089422..35b30a0f 100644 --- a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgeWithLiquidityInformationFixtures.java +++ b/model/src/testFixtures/java/de/cotto/lndmanagej/model/EdgeWithLiquidityInformationFixtures.java @@ -1,6 +1,4 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import de.cotto.lndmanagej.model.Coins; +package de.cotto.lndmanagej.model; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE; diff --git a/model/src/testFixtures/java/de/cotto/lndmanagej/model/RouteFixtures.java b/model/src/testFixtures/java/de/cotto/lndmanagej/model/RouteFixtures.java new file mode 100644 index 00000000..b535c7c8 --- /dev/null +++ b/model/src/testFixtures/java/de/cotto/lndmanagej/model/RouteFixtures.java @@ -0,0 +1,9 @@ +package de.cotto.lndmanagej.model; + +import static de.cotto.lndmanagej.model.BasicRouteFixtures.BASIC_ROUTE; +import static de.cotto.lndmanagej.model.BasicRouteFixtures.BASIC_ROUTE_2; + +public class RouteFixtures { + public static final Route ROUTE = new Route(BASIC_ROUTE); + public static final Route ROUTE_2 = new Route(BASIC_ROUTE_2); +} diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializer.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializer.java index 6553ec62..bcf35daa 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializer.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializer.java @@ -3,8 +3,8 @@ package de.cotto.lndmanagej.pickhardtpayments; import com.google.ortools.graph.MinCostFlow; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.EdgesWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.IntegerMapping; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputation.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputation.java index 355beb04..4ab69252 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputation.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputation.java @@ -8,10 +8,10 @@ import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.DirectedChannelEdge; import de.cotto.lndmanagej.model.Edge; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.LocalChannel; import de.cotto.lndmanagej.model.Policy; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.EdgesWithLiquidityInformation; import de.cotto.lndmanagej.service.BalanceService; import de.cotto.lndmanagej.service.ChannelService; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitter.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitter.java index 2b962d24..d3d31821 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitter.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitter.java @@ -1,14 +1,14 @@ package de.cotto.lndmanagej.pickhardtpayments; import de.cotto.lndmanagej.grpc.GrpcGetInfo; +import de.cotto.lndmanagej.model.BasicRoute; import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.BasicRoute; +import de.cotto.lndmanagej.model.Route; import de.cotto.lndmanagej.pickhardtpayments.model.BasicRoutes; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.Flows; import de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPayment; -import de.cotto.lndmanagej.pickhardtpayments.model.Route; import de.cotto.lndmanagej.pickhardtpayments.model.Routes; import org.springframework.stereotype.Component; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutes.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutes.java index 075a2cf8..b5e72cb4 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutes.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutes.java @@ -1,5 +1,6 @@ package de.cotto.lndmanagej.pickhardtpayments.model; +import de.cotto.lndmanagej.model.BasicRoute; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; import de.cotto.lndmanagej.model.Pubkey; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformation.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformation.java index e8377fc9..eff64568 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformation.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformation.java @@ -2,6 +2,7 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import java.util.Arrays; import java.util.Collection; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPayment.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPayment.java index ad75183d..b528baaa 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPayment.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPayment.java @@ -1,6 +1,7 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.Route; import java.util.List; diff --git a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Routes.java b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Routes.java index 06b3bb1e..a51fa393 100644 --- a/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Routes.java +++ b/pickhardt-payments/src/main/java/de/cotto/lndmanagej/pickhardtpayments/model/Routes.java @@ -1,6 +1,7 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.Route; import java.util.ArrayList; import java.util.Collection; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializerTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializerTest.java index e80fd1b7..d1eba707 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializerTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/ArcInitializerTest.java @@ -4,8 +4,8 @@ import com.google.ortools.Loader; import com.google.ortools.graph.MinCostFlow; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.EdgesWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.IntegerMapping; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputationTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputationTest.java index 6cfc08fd..6dd33980 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputationTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/EdgeComputationTest.java @@ -4,9 +4,9 @@ import de.cotto.lndmanagej.grpc.GrpcGetInfo; import de.cotto.lndmanagej.grpc.GrpcGraph; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.DirectedChannelEdge; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.Node; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.service.BalanceService; import de.cotto.lndmanagej.service.ChannelService; import de.cotto.lndmanagej.service.LiquidityBoundsService; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/FlowComputationTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/FlowComputationTest.java index 584fce04..d29efc15 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/FlowComputationTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/FlowComputationTest.java @@ -4,7 +4,7 @@ import de.cotto.lndmanagej.configuration.ConfigurationService; import de.cotto.lndmanagej.grpc.GrpcGetInfo; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.EdgesWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.Flow; import de.cotto.lndmanagej.pickhardtpayments.model.Flows; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MinCostFlowSolverTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MinCostFlowSolverTest.java index 799d06e3..126b7f60 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MinCostFlowSolverTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MinCostFlowSolverTest.java @@ -1,8 +1,8 @@ package de.cotto.lndmanagej.pickhardtpayments; import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.model.Pubkey; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.EdgesWithLiquidityInformation; import de.cotto.lndmanagej.pickhardtpayments.model.Flow; import de.cotto.lndmanagej.pickhardtpayments.model.Flows; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitterTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitterTest.java index 6a1bc9f2..5f383def 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitterTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/MultiPathPaymentSplitterTest.java @@ -3,11 +3,11 @@ package de.cotto.lndmanagej.pickhardtpayments; import de.cotto.lndmanagej.grpc.GrpcGetInfo; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; -import de.cotto.lndmanagej.pickhardtpayments.model.EdgeWithLiquidityInformation; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; +import de.cotto.lndmanagej.model.Route; import de.cotto.lndmanagej.pickhardtpayments.model.Flow; import de.cotto.lndmanagej.pickhardtpayments.model.Flows; import de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPayment; -import de.cotto.lndmanagej.pickhardtpayments.model.Route; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutesTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutesTest.java index bd781b92..d70f4965 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutesTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/BasicRoutesTest.java @@ -1,5 +1,6 @@ package de.cotto.lndmanagej.pickhardtpayments.model; +import de.cotto.lndmanagej.model.BasicRoute; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformationTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformationTest.java index 0af68cc9..e0024c5e 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformationTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/EdgesWithLiquidityInformationTest.java @@ -1,6 +1,7 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import de.cotto.lndmanagej.model.Coins; +import de.cotto.lndmanagej.model.EdgeWithLiquidityInformation; import org.junit.jupiter.api.Test; import static de.cotto.lndmanagej.model.EdgeFixtures.EDGE; diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentTest.java index e26b9153..c993ea74 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentTest.java @@ -3,9 +3,9 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import de.cotto.lndmanagej.model.Coins; import org.junit.jupiter.api.Test; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE_2; import static de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPaymentFixtures.MULTI_PATH_PAYMENT; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE_2; import static org.assertj.core.api.Assertions.assertThat; class MultiPathPaymentTest { diff --git a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RoutesTest.java b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RoutesTest.java index 1f2b0d51..82cf175e 100644 --- a/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RoutesTest.java +++ b/pickhardt-payments/src/test/java/de/cotto/lndmanagej/pickhardtpayments/model/RoutesTest.java @@ -1,7 +1,9 @@ package de.cotto.lndmanagej.pickhardtpayments.model; +import de.cotto.lndmanagej.model.BasicRoute; import de.cotto.lndmanagej.model.Coins; import de.cotto.lndmanagej.model.Edge; +import de.cotto.lndmanagej.model.Route; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentFixtures.java b/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentFixtures.java index 19c0342e..c95aec32 100644 --- a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentFixtures.java +++ b/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/MultiPathPaymentFixtures.java @@ -2,8 +2,8 @@ package de.cotto.lndmanagej.pickhardtpayments.model; import java.util.List; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE_2; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE_2; public class MultiPathPaymentFixtures { public static final MultiPathPayment MULTI_PATH_PAYMENT = new MultiPathPayment(List.of(ROUTE, ROUTE_2)); diff --git a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteFixtures.java b/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteFixtures.java deleted file mode 100644 index e6e7dd63..00000000 --- a/pickhardt-payments/src/testFixtures/java/de/cotto/lndmanagej/pickhardtpayments/model/RouteFixtures.java +++ /dev/null @@ -1,9 +0,0 @@ -package de.cotto.lndmanagej.pickhardtpayments.model; - -import static de.cotto.lndmanagej.pickhardtpayments.model.BasicRouteFixtures.BASIC_ROUTE; -import static de.cotto.lndmanagej.pickhardtpayments.model.BasicRouteFixtures.BASIC_ROUTE_2; - -public class RouteFixtures { - public static final Route ROUTE = new Route(BASIC_ROUTE); - public static final Route ROUTE_2 = new Route(BASIC_ROUTE_2); -} diff --git a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java index f615c2f6..924e766c 100644 --- a/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java +++ b/web/src/integrationTest/java/de/cotto/lndmanagej/controller/PickhardtPaymentsControllerIT.java @@ -16,9 +16,9 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_5; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY; import static de.cotto.lndmanagej.model.PubkeyFixtures.PUBKEY_2; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; import static de.cotto.lndmanagej.pickhardtpayments.PickhardtPaymentsConfiguration.DEFAULT_FEE_RATE_WEIGHT; import static de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPaymentFixtures.MULTI_PATH_PAYMENT; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.core.Is.is; diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java index 9e5933fb..61b01233 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDto.java @@ -1,7 +1,7 @@ package de.cotto.lndmanagej.controller.dto; +import de.cotto.lndmanagej.model.Route; import de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPayment; -import de.cotto.lndmanagej.pickhardtpayments.model.Route; import java.util.List; diff --git a/web/src/main/java/de/cotto/lndmanagej/controller/dto/RouteDto.java b/web/src/main/java/de/cotto/lndmanagej/controller/dto/RouteDto.java index 006a4367..4989b432 100644 --- a/web/src/main/java/de/cotto/lndmanagej/controller/dto/RouteDto.java +++ b/web/src/main/java/de/cotto/lndmanagej/controller/dto/RouteDto.java @@ -2,7 +2,7 @@ package de.cotto.lndmanagej.controller.dto; import de.cotto.lndmanagej.model.ChannelId; import de.cotto.lndmanagej.model.Edge; -import de.cotto.lndmanagej.pickhardtpayments.model.Route; +import de.cotto.lndmanagej.model.Route; import java.util.List; diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java index 70fe74be..7ed72cfc 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/MultiPathPaymentDtoTest.java @@ -8,9 +8,9 @@ import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_2; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_5; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE_2; import static de.cotto.lndmanagej.pickhardtpayments.model.MultiPathPaymentFixtures.MULTI_PATH_PAYMENT; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE_2; import static org.assertj.core.api.Assertions.assertThat; class MultiPathPaymentDtoTest { diff --git a/web/src/test/java/de/cotto/lndmanagej/controller/dto/RouteDtoTest.java b/web/src/test/java/de/cotto/lndmanagej/controller/dto/RouteDtoTest.java index 8aaa1d22..742402c7 100644 --- a/web/src/test/java/de/cotto/lndmanagej/controller/dto/RouteDtoTest.java +++ b/web/src/test/java/de/cotto/lndmanagej/controller/dto/RouteDtoTest.java @@ -7,7 +7,7 @@ import java.util.List; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_3; import static de.cotto.lndmanagej.model.ChannelIdFixtures.CHANNEL_ID_5; -import static de.cotto.lndmanagej.pickhardtpayments.model.RouteFixtures.ROUTE; +import static de.cotto.lndmanagej.model.RouteFixtures.ROUTE; import static org.assertj.core.api.Assertions.assertThat; class RouteDtoTest {