Skip to content

Commit 65acc36

Browse files
jasagredojasagredo
committed
Tweaks from self-review
1 parent 48b7a76 commit 65acc36

File tree

17 files changed

+123
-72
lines changed

17 files changed

+123
-72
lines changed

‎ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/ByronHFC.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import Ouroboros.Consensus.Ledger.Query
4747
import Ouroboros.Consensus.Node.NetworkProtocolVersion
4848
import Ouroboros.Consensus.Node.Serialisation
4949
import Ouroboros.Consensus.Protocol.PBFT (PBft, PBftCrypto)
50-
import Ouroboros.Consensus.Storage.LedgerDB.V2.LSM
50+
import Ouroboros.Consensus.Storage.LedgerDB
5151
import Ouroboros.Consensus.Storage.Serialisation
5252
import Ouroboros.Consensus.Util.IndexedMemPack
5353

@@ -318,7 +318,7 @@ type instance
318318
LSMTxOut (LedgerState (HardForkBlock '[ByronBlock])) =
319319
TxOut (LedgerState (HardForkBlock '[ByronBlock]))
320320

321-
instance ToLSMTxOut (LedgerState (HardForkBlock '[ByronBlock])) where
321+
instance HasLSMTxOut (LedgerState (HardForkBlock '[ByronBlock])) where
322322
toLSMTxOut _ = id
323323
fromLSMTxOut _ = id
324324

‎ouroboros-consensus-cardano/src/byron/Ouroboros/Consensus/Byron/Ledger/Ledger.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import Ouroboros.Consensus.Ledger.SupportsPeerSelection
9393
import Ouroboros.Consensus.Ledger.SupportsProtocol
9494
import Ouroboros.Consensus.Ledger.Tables.Utils
9595
import Ouroboros.Consensus.Storage.LedgerDB
96-
import Ouroboros.Consensus.Storage.LedgerDB.V2.LSM
9796
import Ouroboros.Consensus.Util (ShowProxy (..))
9897
import Ouroboros.Consensus.Util.IndexedMemPack
9998

@@ -206,7 +205,7 @@ type instance TxIn (LedgerState ByronBlock) = Void
206205
type instance TxOut (LedgerState ByronBlock) = Void
207206
type instance LSMTxOut (LedgerState ByronBlock) = TxOut (LedgerState ByronBlock)
208207

209-
instance ToLSMTxOut (LedgerState ByronBlock) where
208+
instance HasLSMTxOut (LedgerState ByronBlock) where
210209
toLSMTxOut _ = id
211210
fromLSMTxOut _ = id
212211

‎ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Ledger.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ instance LSM.SerialiseValue LSM.RawBytes where
126126

127127
deriving via LSM.ResolveAsFirst LSM.RawBytes instance LSM.ResolveValue LSM.RawBytes
128128

129-
instance CardanoHardForkConstraints c => ToLSMTxOut (LedgerState (CardanoBlock c)) where
129+
instance CardanoHardForkConstraints c => HasLSMTxOut (LedgerState (CardanoBlock c)) where
130130
toLSMTxOut _ txout =
131131
let barr = eliminateCardanoTxOut (const pack) txout
132132
in LSM.RawBytes (Vector 0 (PBA.sizeofByteArray barr) barr)

‎ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Ledger.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ type instance
341341
LSMTxOut (LedgerState (ShelleyBlock proto era)) =
342342
TxOut (LedgerState (ShelleyBlock proto era))
343343

344-
instance ToLSMTxOut (LedgerState (ShelleyBlock proto era)) where
344+
instance HasLSMTxOut (LedgerState (ShelleyBlock proto era)) where
345345
toLSMTxOut _ = id
346346
fromLSMTxOut _ = id
347347

‎ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/ShelleyHFC.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ type instance
445445
LSMTxOut (LedgerState (HardForkBlock '[ShelleyBlock proto era])) =
446446
TxOut (LedgerState (HardForkBlock '[ShelleyBlock proto era]))
447447

448-
instance ToLSMTxOut (LedgerState (HardForkBlock '[ShelleyBlock proto era])) where
448+
instance HasLSMTxOut (LedgerState (HardForkBlock '[ShelleyBlock proto era])) where
449449
toLSMTxOut _ = id
450450
fromLSMTxOut _ = id
451451

‎ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/HardFork/Combinator/Serialisation/Common.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ import Ouroboros.Consensus.Ledger.Query
105105
import Ouroboros.Consensus.Ledger.Tables
106106
import Ouroboros.Consensus.Node.NetworkProtocolVersion
107107
import Ouroboros.Consensus.Node.Run
108-
import Ouroboros.Consensus.Storage.LedgerDB.V2.LSM
108+
import Ouroboros.Consensus.Storage.LedgerDB
109109
import Ouroboros.Consensus.Storage.Serialisation
110110
import Ouroboros.Consensus.TypeFamilyWrappers
111111
import Ouroboros.Network.Block (Serialised)
@@ -201,8 +201,7 @@ class
201201
, -- LedgerTables on the HardForkBlock might not be compositionally
202202
-- defined, but we need to require this instances for any instantiation.
203203
HasLedgerTables (LedgerState (HardForkBlock xs))
204-
, SerializeTablesWithHint (LedgerState (HardForkBlock xs))
205-
, GoodForLSM (LedgerState (HardForkBlock xs))
204+
, LedgerSupportsLedgerDB (HardForkBlock xs)
206205
) =>
207206
SerialiseHFC xs
208207
where

‎ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Ledger/Dual.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ import Ouroboros.Consensus.Ledger.SupportsPeerSelection
9595
import Ouroboros.Consensus.Ledger.SupportsProtocol
9696
import Ouroboros.Consensus.Ledger.Tables.Utils
9797
import Ouroboros.Consensus.Storage.LedgerDB
98-
import Ouroboros.Consensus.Storage.LedgerDB.V2.LSM
9998
import Ouroboros.Consensus.Storage.Serialisation
10099
import Ouroboros.Consensus.Util (ShowProxy (..))
101100
import Ouroboros.Consensus.Util.Condense
@@ -1106,7 +1105,7 @@ type instance TxIn (LedgerState (DualBlock m a)) = TxIn (LedgerState m)
11061105
type instance TxOut (LedgerState (DualBlock m a)) = TxOut (LedgerState m)
11071106
type instance LSMTxOut (LedgerState (DualBlock m a)) = TxOut (LedgerState m)
11081107

1109-
instance ToLSMTxOut (LedgerState (DualBlock m a)) where
1108+
instance HasLSMTxOut (LedgerState (DualBlock m a)) where
11101109
toLSMTxOut _ = id
11111110
fromLSMTxOut _ = id
11121111

‎ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Node/Run.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import Ouroboros.Consensus.Storage.ChainDB
4242
, VolatileDbSerialiseConstraints
4343
)
4444
import Ouroboros.Consensus.Storage.LedgerDB
45-
import Ouroboros.Consensus.Storage.LedgerDB.V2.LSM
4645
import Ouroboros.Consensus.Storage.Serialisation
4746
import Ouroboros.Consensus.Util (ShowProxy)
4847
import Ouroboros.Network.Block (Serialised)
@@ -121,7 +120,6 @@ class
121120
, ShowProxy (TxId (GenTx blk))
122121
, (forall fp. ShowQuery (BlockQuery blk fp))
123122
, LedgerSupportsLedgerDB blk
124-
, GoodForLSM (LedgerState blk)
125123
) =>
126124
RunNode blk
127125

‎ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/Impl.hs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ module Ouroboros.Consensus.Storage.ChainDB.Impl
3838
, openDBInternal
3939
) where
4040

41-
import qualified Ouroboros.Consensus.Storage.LedgerDB.V2.LSM as LSM
4241
import Control.Monad (void, when)
4342
import Control.Monad.Trans.Class (lift)
4443
import Control.ResourceRegistry
@@ -61,7 +60,6 @@ import Ouroboros.Consensus.HardFork.Abstract
6160
import Ouroboros.Consensus.HeaderValidation (mkHeaderWithTime)
6261
import Ouroboros.Consensus.Ledger.Extended (ledgerState)
6362
import Ouroboros.Consensus.Ledger.Inspect
64-
import Ouroboros.Consensus.Ledger.Basics
6563
import Ouroboros.Consensus.Ledger.SupportsProtocol
6664
import Ouroboros.Consensus.Storage.ChainDB.API (ChainDB)
6765
import qualified Ouroboros.Consensus.Storage.ChainDB.API as API
@@ -107,7 +105,6 @@ withDB ::
107105
, ConvertRawHash blk
108106
, SerialiseDiskConstraints blk
109107
, LedgerSupportsLedgerDB blk
110-
, LSM.GoodForLSM (LedgerState blk)
111108
) =>
112109
Complete Args.ChainDbArgs m blk ->
113110
(ChainDB m blk -> m a) ->
@@ -124,7 +121,6 @@ openDB ::
124121
, ConvertRawHash blk
125122
, SerialiseDiskConstraints blk
126123
, LedgerSupportsLedgerDB blk
127-
, LSM.GoodForLSM (LedgerState blk)
128124
) =>
129125
Complete Args.ChainDbArgs m blk ->
130126
m (ChainDB m blk)
@@ -141,7 +137,6 @@ openDBInternal ::
141137
, SerialiseDiskConstraints blk
142138
, HasCallStack
143139
, LedgerSupportsLedgerDB blk
144-
, LSM.GoodForLSM (LedgerState blk)
145140
) =>
146141
Complete Args.ChainDbArgs m blk ->
147142
-- | 'True' = Launch background tasks

‎ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/LedgerDB.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ module Ouroboros.Consensus.Storage.LedgerDB
2020
import Control.ResourceRegistry
2121
import Data.Functor.Contravariant ((>$<))
2222
import Data.Word
23-
import qualified Database.LSMTree as LSM hiding (deleteSnapshot)
2423
import Ouroboros.Consensus.Block
2524
import Ouroboros.Consensus.HardFork.Abstract
26-
import Ouroboros.Consensus.Ledger.Basics
2725
import Ouroboros.Consensus.Ledger.Inspect
2826
import Ouroboros.Consensus.Ledger.SupportsProtocol
2927
import Ouroboros.Consensus.Storage.ImmutableDB.Stream
@@ -45,12 +43,10 @@ openDB ::
4543
forall m blk.
4644
( IOLike m
4745
, LedgerSupportsProtocol blk
48-
, LedgerDbSerialiseConstraints blk
4946
, InspectLedger blk
5047
, HasCallStack
5148
, HasHardForkHistory blk
5249
, LedgerSupportsLedgerDB blk
53-
, LSM.GoodForLSM (LedgerState blk)
5450
) =>
5551
-- | Stateless initializaton arguments
5652
Complete LedgerDbArgs m blk ->

0 commit comments

Comments
 (0)