From 60ef40a8850dd06d07c74faec9c226c1ce8ae8b1 Mon Sep 17 00:00:00 2001 From: Heinrich Apfelmus Date: Fri, 30 Aug 2024 15:00:38 +0200 Subject: [PATCH] Use `Read.ChainPoint` in `Cardano.Wallet.Deposit.Read` --- .../Cardano/Wallet/Deposit/IO/Network/Mock.hs | 18 ++++++++++++++---- .../src/Cardano/Wallet/Deposit/Read.hs | 10 ++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Mock.hs b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Mock.hs index 0c359155d50..74f11a02285 100644 --- a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Mock.hs +++ b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/IO/Network/Mock.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE DuplicateRecordFields #-} {-| Copyright: © 2024 Cardano Foundation License: Apache-2.0 @@ -93,10 +94,19 @@ newNetworkEnvMock = do } genesis :: Read.ChainPoint -genesis = Read.Origin +genesis = Read.GenesisPoint getBlockPoint :: Read.Block -> Read.ChainPoint -getBlockPoint = Read.At . Read.slotNo . Read.blockHeaderBody . Read.blockHeader +getBlockPoint block = + Read.BlockPoint + { Read.slotNo = slot + , Read.headerHash = + Read.mockRawHeaderHash + $ fromIntegral $ fromEnum slot + } + where + bhBody = Read.blockHeaderBody $ Read.blockHeader block + slot = Read.slotNo bhBody mkNextBlock :: Read.ChainPoint -> [Tx Conway] -> Read.Block mkNextBlock tipOld txs = @@ -114,5 +124,5 @@ mkNextBlock tipOld txs = } where slotNext = case tipOld of - Read.Origin -> 1 - Read.At n -> succ n + Read.GenesisPoint -> 1 + Read.BlockPoint{slotNo = n} -> succ n diff --git a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs index 54518b35021..2d7f389ef1a 100644 --- a/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs +++ b/lib/customer-deposit-wallet/src/Cardano/Wallet/Deposit/Read.hs @@ -8,9 +8,7 @@ module Cardano.Wallet.Deposit.Read ( Network (..) , Read.SlotNo - , toSlot - , fromSlot - , ChainPoint (..) + , Read.ChainPoint (..) , Address , KeyHash @@ -34,6 +32,7 @@ module Cardano.Wallet.Deposit.Read , BlockNo , Block (..) , BHeader (..) + , Read.mockRawHeaderHash , BHBody (..) , GenesisData @@ -78,11 +77,6 @@ import qualified Data.ByteString.Short as SBS ------------------------------------------------------------------------------} data Network = Testnet | Mainnet -data ChainPoint - = Origin - | At Read.SlotNo - deriving (Eq, Ord, Show) - -- | Synonym for readability. -- The ledger specifications define @Addr@. -- Byron addresses are represented by @Addr_bootstrap@.