Replace Block by Read.Block

cardano-foundation · Oct 1, 2024 · 9b2fd9e · 9b2fd9e
1 parent 99d15f2
commit 9b2fd9e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 69 deletions.
diff --git a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure.hs b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure.hs
@@ -197,7 +197,7 @@ rollForwardUTxO isOurs block u =
     UTxOHistory.appendBlock slot deltaUTxO u
   where
     (deltaUTxO,_) = Balance.applyBlock isOurs block (UTxOHistory.getUTxO u)
-    slot = Read.slotNo . Read.blockHeaderBody $ Read.blockHeader block
+    slot = Read.getEraSlotNo $ Read.getEraBHeader block
 
 rollBackward
     :: Read.ChainPoint

diff --git a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure/Balance.hs b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Pure/Balance.hs
@@ -64,7 +64,7 @@ applyBlock isOurs block u0 =
   where
     (dus, u1) =
         mapAccumL' (applyTx isOurs) u0
-            $ Read.transactions block
+            $ Read.getEraTransactions block
 
 {-----------------------------------------------------------------------------
     Helpers

diff --git a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs
@@ -38,13 +38,13 @@ module Cardano.Wallet.Deposit.Read
     , TxBody
     , TxWitness
 
-    , BlockNo
-    , Block (..)
-    , getChainPoint
+    , Read.Block
+    , Read.getChainPoint
+    , Read.getEraBHeader
+    , Read.getEraSlotNo
+    , Read.getEraTransactions
     , mockNextBlock
-    , BHeader (..)
     , Read.mockRawHeaderHash
-    , BHBody (..)
 
     , GenesisData
     , GenesisHash
@@ -55,6 +55,12 @@ module Cardano.Wallet.Deposit.Read
 
 import Prelude
 
+import Cardano.Wallet.Read.Block.Gen
+    ( mkBlockEra
+    )
+import Cardano.Wallet.Read.Block.Gen.BlockParameters
+    ( BlockParameters (..)
+    )
 import Cardano.Wallet.Read.Chain
     ( Slot
     , WithOrigin (..)
@@ -75,16 +81,12 @@ import Data.Maybe
 import Data.Word
     ( Word8
     )
-import Numeric.Natural
-    ( Natural
-    )
 
 import qualified Cardano.Chain.Genesis as Byron
 import qualified Cardano.Wallet.Read as Read
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as B8
 import qualified Data.ByteString.Short as SBS
--- import qualified Ouroboros.Consensus.Cardano.Block as O
 
 {-----------------------------------------------------------------------------
     Type definitions
@@ -130,68 +132,16 @@ type TxWitness = ()
 {-----------------------------------------------------------------------------
     Block
 ------------------------------------------------------------------------------}
-type BlockNo = Natural
-
--- type Block = O.CardanoBlock O.StandardCrypto
-data Block era = Block
-    { blockHeader :: BHeader
-    , transactions :: [Read.Tx era]
-    }
-
-data BHeader = BHeader
-    { blockHeaderBody :: BHBody
-    , blockHeaderSignature :: Sig
-    }
-    deriving (Eq, Ord, Show)
-
-type Sig = ()
-
-data BHBody = BHBody
-    { prev :: Maybe HashHeader
-    , blockno :: BlockNo
-    , slotNo :: Read.SlotNo
-    , bhash :: HashBBody
-    }
-    deriving (Eq, Ord, Show)
-
-type HashHeader = Read.RawHeaderHash
-type HashBBody = ()
-
-getChainPoint :: Read.IsEra era => Block era -> Read.ChainPoint
-getChainPoint block =
-    Read.BlockPoint
-        { Read.slotNo = slot
-        , Read.headerHash =
-            Read.mockRawHeaderHash
-            $ fromIntegral $ fromEnum slot
-        }
-  where
-    bhBody = blockHeaderBody $ blockHeader block
-    slot = slotNo bhBody
-
 -- | Create a new block from a sequence of transaction.
-mockNextBlock :: Read.ChainPoint -> [Read.Tx Read.Conway] -> Block Read.Conway
+mockNextBlock
+    :: Read.ChainPoint -> [Read.Tx Read.Conway] -> Read.Block Read.Conway
 mockNextBlock old txs =
-    Block
-        { blockHeader = BHeader
-            { blockHeaderBody = BHBody
-                { prev
-                , blockno
-                , slotNo
-                , bhash = ()
-                }
-            , blockHeaderSignature = ()
-            }
-        , transactions = txs
-        }
+    mkBlockEra BlockParameters{slotNumber,blockNumber,txs}
   where
-    blockno = toEnum $ fromEnum slotNo
-    slotNo = case old of
-        Read.GenesisPoint -> 0
+    blockNumber = Read.BlockNo $ Read.unSlotNo slotNumber
+    slotNumber = case old of
+        Read.GenesisPoint -> Read.SlotNo 0
         Read.BlockPoint{slotNo = n} -> succ n
-    prev = case old of
-        Read.GenesisPoint -> Nothing
-        Read.BlockPoint{headerHash} -> Just headerHash
 
 {-----------------------------------------------------------------------------
     Genesis