Skip to content

Commit 48b7a76

Browse files
committed
Update LSM
1 parent 30e1fa0 commit 48b7a76

File tree

6 files changed

+2
-17
lines changed

6 files changed

+2
-17
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ source-repository-package
118118
source-repository-package
119119
type: git
120120
location: https://github.com/jasagredo/lsm-tree
121-
tag: 2491d82e325be54dfa3525175f3382b56404404c
121+
tag: 0fe8b227b78a78503d0201755d50435635da5a22
122122
subdir:
123123
.
124124
blockio

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Control.Monad (guard)
3636
import Data.Coerce (coerce)
3737
import Data.Maybe
3838
import Data.Text (Text)
39-
import Data.Void (Void, absurd)
39+
import Data.Void (Void)
4040
import Ouroboros.Consensus.Block
4141
import Ouroboros.Consensus.BlockchainTime (SystemStart (..))
4242
import Ouroboros.Consensus.Byron.Crypto.DSIGN
@@ -61,18 +61,11 @@ import Ouroboros.Consensus.Storage.ChainDB.Init (InitChainDB (..))
6161
import Ouroboros.Consensus.Storage.ImmutableDB (simpleChunkInfo)
6262
import Ouroboros.Consensus.Util ((....:))
6363
import Ouroboros.Network.Magic (NetworkMagic (..))
64-
import qualified Database.LSMTree as LSM
6564

6665
{-------------------------------------------------------------------------------
6766
Credentials
6867
-------------------------------------------------------------------------------}
6968

70-
instance LSM.SerialiseKey Void where
71-
serialiseKey = absurd
72-
deserialiseKey = error "deserialiseKey: Void"
73-
74-
deriving via LSM.ResolveAsFirst Void instance LSM.ResolveValue Void
75-
7669
-- | Credentials needed to produce blocks in the Byron era.
7770
data ByronLeaderCredentials = ByronLeaderCredentials
7871
{ blcSignKey :: Crypto.SigningKey

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ import qualified Control.State.Transition.Extended as STS
101101
import Data.Coerce (coerce)
102102
import Data.Functor.Identity
103103
import Data.MemPack
104-
import Data.Primitive.ByteArray as PBA
105104
import qualified Data.Text as T
106105
import qualified Data.Text as Text
107-
import Data.Vector.Primitive (Vector (..))
108106
import Data.Word
109107
import qualified Database.LSMTree as LSM
110108
import GHC.Generics (Generic)

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ import Ouroboros.Consensus.Storage.LedgerDB.Args
128128
import Ouroboros.Consensus.Storage.LedgerDB.Snapshots
129129
import Ouroboros.Consensus.Util.Args
130130
import Ouroboros.Consensus.Util.IOLike
131-
import System.FS.BlockIO.API
132131
import System.FS.BlockIO.IO
133132
import Ouroboros.Consensus.Util.Orphans ()
134133
import Ouroboros.Consensus.Util.Time (secondsToNominalDiffTime)

ouroboros-consensus/ouroboros-consensus.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ library
303303
bimap >=0.4 && <0.6,
304304
binary >=0.8 && <0.11,
305305
bytestring >=0.10 && <0.13,
306-
random,
307306
cardano-binary,
308307
cardano-crypto-class,
309308
cardano-ledger-core ^>=1.18,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ import Ouroboros.Consensus.Util.Args
4040
import Ouroboros.Consensus.Util.CallStack
4141
import Ouroboros.Consensus.Util.IOLike
4242
import System.FS.API
43-
import System.FS.BlockIO.API
44-
import System.FS.BlockIO.IO
45-
import System.FS.IO
46-
import System.Random
4743

4844
openDB ::
4945
forall m blk.

0 commit comments

Comments
 (0)