From b68ea855d0d41c2d3e94eca5b3864082bc88d127 Mon Sep 17 00:00:00 2001 From: paolino Date: Tue, 21 Nov 2023 16:49:26 +0000 Subject: [PATCH] Move Checkpoint.Policy to primitive --- lib/primitive/cardano-wallet-primitive.cabal | 1 + .../Cardano/Wallet/Primitive/Types}/Checkpoints/Policy.hs | 2 +- lib/wallet/bench/restore-bench.hs | 2 +- lib/wallet/cardano-wallet.cabal | 1 - lib/wallet/src/Cardano/Wallet.hs | 2 +- lib/wallet/src/Cardano/Wallet/Network.hs | 6 +++--- lib/wallet/src/Cardano/Wallet/Pools.hs | 2 +- .../test/unit/Cardano/Wallet/Checkpoints/PolicySpec.hs | 4 ++-- lib/wallet/test/unit/Cardano/Wallet/Network/LightSpec.hs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename lib/{wallet/src/Cardano/Wallet => primitive/lib/Cardano/Wallet/Primitive/Types}/Checkpoints/Policy.hs (99%) diff --git a/lib/primitive/cardano-wallet-primitive.cabal b/lib/primitive/cardano-wallet-primitive.cabal index fbbe494b0db..3109d9a3e69 100644 --- a/lib/primitive/cardano-wallet-primitive.cabal +++ b/lib/primitive/cardano-wallet-primitive.cabal @@ -105,6 +105,7 @@ library Cardano.Wallet.Primitive.Types.Block Cardano.Wallet.Primitive.Types.Block.Gen Cardano.Wallet.Primitive.Types.BlockSummary + Cardano.Wallet.Primitive.Types.Checkpoints.Policy Cardano.Wallet.Primitive.Types.Coin Cardano.Wallet.Primitive.Types.Coin.Gen Cardano.Wallet.Primitive.Types.DecentralizationLevel diff --git a/lib/wallet/src/Cardano/Wallet/Checkpoints/Policy.hs b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Checkpoints/Policy.hs similarity index 99% rename from lib/wallet/src/Cardano/Wallet/Checkpoints/Policy.hs rename to lib/primitive/lib/Cardano/Wallet/Primitive/Types/Checkpoints/Policy.hs index 91717ebbe26..8b3dd3de130 100644 --- a/lib/wallet/src/Cardano/Wallet/Checkpoints/Policy.hs +++ b/lib/primitive/lib/Cardano/Wallet/Primitive/Types/Checkpoints/Policy.hs @@ -4,7 +4,7 @@ -- -- Abstract data type that describes a policy for keeping and discarding -- checkpoints. To be used with the 'Checkpoints' type. -module Cardano.Wallet.Checkpoints.Policy +module Cardano.Wallet.Primitive.Types.Checkpoints.Policy ( BlockHeight , CheckpointPolicy , nextCheckpoint diff --git a/lib/wallet/bench/restore-bench.hs b/lib/wallet/bench/restore-bench.hs index f5de696242e..c5c310084a7 100644 --- a/lib/wallet/bench/restore-bench.hs +++ b/lib/wallet/bench/restore-bench.hs @@ -366,9 +366,9 @@ import UnliftIO.Exception import qualified Cardano.Wallet as W import qualified Cardano.Wallet.Address.Derivation.Byron as Byron import qualified Cardano.Wallet.Address.Derivation.Shelley as Shelley -import qualified Cardano.Wallet.Checkpoints.Policy as CP import qualified Cardano.Wallet.DB.Sqlite.Migration.Old as Sqlite import qualified Cardano.Wallet.Primitive.Types as W +import qualified Cardano.Wallet.Primitive.Types.Checkpoints.Policy as CP import qualified Cardano.Wallet.Primitive.Types.TokenBundle as TokenBundle import qualified Cardano.Wallet.Primitive.Types.UTxO as UTxO import qualified Cardano.Wallet.Primitive.Types.UTxOStatistics as UTxOStatistics diff --git a/lib/wallet/cardano-wallet.cabal b/lib/wallet/cardano-wallet.cabal index c7aba78333e..224553342df 100644 --- a/lib/wallet/cardano-wallet.cabal +++ b/lib/wallet/cardano-wallet.cabal @@ -246,7 +246,6 @@ library Cardano.Wallet.Balance.Migration.Selection Cardano.Wallet.Byron.Compatibility Cardano.Wallet.Checkpoints - Cardano.Wallet.Checkpoints.Policy Cardano.Wallet.CLI Cardano.Wallet.Compat Cardano.Wallet.DB diff --git a/lib/wallet/src/Cardano/Wallet.hs b/lib/wallet/src/Cardano/Wallet.hs index 75ca462be09..4c57c341fac 100644 --- a/lib/wallet/src/Cardano/Wallet.hs +++ b/lib/wallet/src/Cardano/Wallet.hs @@ -805,13 +805,13 @@ import qualified Cardano.Wallet.Address.Discovery.Random as Rnd import qualified Cardano.Wallet.Address.Discovery.Sequential as Seq import qualified Cardano.Wallet.Address.Discovery.Shared as Shared import qualified Cardano.Wallet.Balance.Migration as Migration -import qualified Cardano.Wallet.Checkpoints.Policy as CP import qualified Cardano.Wallet.DB.Store.Delegations.Layer as Dlgs import qualified Cardano.Wallet.DB.Store.Submissions.Layer as Submissions import qualified Cardano.Wallet.DB.WalletState as WalletState import qualified Cardano.Wallet.DB.WalletState as WS import qualified Cardano.Wallet.Primitive.Slotting as Slotting import qualified Cardano.Wallet.Primitive.Types as W +import qualified Cardano.Wallet.Primitive.Types.Checkpoints.Policy as CP import qualified Cardano.Wallet.Primitive.Types.Coin as Coin import qualified Cardano.Wallet.Primitive.Types.TokenBundle as TokenBundle import qualified Cardano.Wallet.Primitive.Types.TokenMap as TokenMap diff --git a/lib/wallet/src/Cardano/Wallet/Network.hs b/lib/wallet/src/Cardano/Wallet/Network.hs index dc943e62be5..086426f7b39 100644 --- a/lib/wallet/src/Cardano/Wallet/Network.hs +++ b/lib/wallet/src/Cardano/Wallet/Network.hs @@ -50,9 +50,6 @@ import Cardano.BM.Data.Tracer import Cardano.Pool.Types ( StakePoolsSummary ) -import Cardano.Wallet.Checkpoints.Policy - ( CheckpointPolicy - ) import Cardano.Wallet.Primitive.Slotting ( PastHorizonException , TimeInterpreter @@ -71,6 +68,9 @@ import Cardano.Wallet.Primitive.Types import Cardano.Wallet.Primitive.Types.BlockSummary ( LightSummary ) +import Cardano.Wallet.Primitive.Types.Checkpoints.Policy + ( CheckpointPolicy + ) import Cardano.Wallet.Primitive.Types.Coin ( Coin ) diff --git a/lib/wallet/src/Cardano/Wallet/Pools.hs b/lib/wallet/src/Cardano/Wallet/Pools.hs index c96572167f1..53cd33c2afc 100644 --- a/lib/wallet/src/Cardano/Wallet/Pools.hs +++ b/lib/wallet/src/Cardano/Wallet/Pools.hs @@ -291,7 +291,7 @@ import UnliftIO.STM import qualified Cardano.Pool.DB as PoolDb import qualified Cardano.Pool.DB.Layer as Pool -import qualified Cardano.Wallet.Checkpoints.Policy as CP +import qualified Cardano.Wallet.Primitive.Types.Checkpoints.Policy as CP import qualified Cardano.Wallet.Primitive.Types.Coin as Coin import qualified Data.List as L import qualified Data.List.NonEmpty as NE diff --git a/lib/wallet/test/unit/Cardano/Wallet/Checkpoints/PolicySpec.hs b/lib/wallet/test/unit/Cardano/Wallet/Checkpoints/PolicySpec.hs index 798c21e6784..848d06c1359 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/Checkpoints/PolicySpec.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/Checkpoints/PolicySpec.hs @@ -5,7 +5,7 @@ module Cardano.Wallet.Checkpoints.PolicySpec import Prelude -import Cardano.Wallet.Checkpoints.Policy +import Cardano.Wallet.Primitive.Types.Checkpoints.Policy ( BlockHeight , CheckpointPolicy , nextCheckpoint @@ -30,7 +30,7 @@ import Test.QuickCheck , (===) ) -import qualified Cardano.Wallet.Checkpoints.Policy as CP +import qualified Cardano.Wallet.Primitive.Types.Checkpoints.Policy as CP import qualified Data.Set as Set spec :: Spec diff --git a/lib/wallet/test/unit/Cardano/Wallet/Network/LightSpec.hs b/lib/wallet/test/unit/Cardano/Wallet/Network/LightSpec.hs index dc667440e59..b7a0f9ac5d0 100644 --- a/lib/wallet/test/unit/Cardano/Wallet/Network/LightSpec.hs +++ b/lib/wallet/test/unit/Cardano/Wallet/Network/LightSpec.hs @@ -88,7 +88,7 @@ import Test.QuickCheck , (===) ) -import qualified Cardano.Wallet.Checkpoints.Policy as CP +import qualified Cardano.Wallet.Primitive.Types.Checkpoints.Policy as CP import qualified Data.ByteString.Char8 as B8 import qualified Data.List as L import qualified Data.List.NonEmpty as NE