Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the Ord instance for TxIn #2586

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Fix the Ord instance for TxIn #2586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3d257
Fix the `Ord` instance for `TxIn`
lehins Dec 14, 2021
ff6af85
Fix specialized intersections with `Set` and `Map` for `SplitMap`
lehins Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions libs/cardano-ledger-core/src/Cardano/Ledger/TxIn.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,10 @@ pattern TxIn addr index <-

{-# COMPLETE TxIn #-}

-- | This instance is crafted to agreee with TxIn as the domain of SplitMap
instance Ord (TxIn crypto) where
compare (TxInCompact id1 n1) (TxInCompact id2 n2) =
case compare n1 n2 of
EQ -> compare id1 id2
other -> other

deriving instance Eq (TxIn crypto)

deriving instance Ord (TxIn crypto)

deriving instance Show (TxIn crypto)

deriving instance CC.Crypto crypto => NFData (TxIn crypto)
Expand Down
32 changes: 5 additions & 27 deletions libs/compact-map/src/Data/Compact/SplitMap.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ import qualified Data.Compact.KeyMap as KeyMap
import Data.Foldable (foldl')
import qualified Data.IntMap as IntMap
import Data.IntMap.Strict (IntMap)
import Data.Map.Internal (Map (..), link, link2)
import Data.Map (Map)
import qualified Data.Map.Strict as Map
import Data.Set (Set)
import qualified Data.Set as Set
import qualified Data.Set.Internal as IT
import Data.Text (pack)
import Prettyprinter
import Prelude hiding (lookup)
Expand Down Expand Up @@ -191,40 +190,19 @@ foldIntersectIntMap accum ans0 imap1 imap2 =
-- Only those keys 'k' that meet the predicate 'p' are included.
-- The result isa Data.Map
intersectMapSplit :: (k -> v -> u -> Bool) -> Map.Map k v -> SplitMap k u -> Map.Map k v
intersectMapSplit _ Tip _ = Tip
intersectMapSplit p (Bin _ k v l r) sp =
case splitLookup k sp of
(sl, Nothing, sr) -> link2 (intersectMapSplit p l sl) (intersectMapSplit p r sr)
(sl, Just u, sr) ->
if p k v u
then link k v (intersectMapSplit p l sl) (intersectMapSplit p r sr)
else link2 (intersectMapSplit p l sl) (intersectMapSplit p r sr)
intersectMapSplit p m sm = Map.filterWithKey (\k v -> maybe False (p k v) $ lookup k sm) m

-- | The intersection over the common domain 'k' of a Data.Set and a SplitMap
-- Only those keys 'k' that meet the predicate 'p' are included.
-- The result is a Data.Set
intersectSetSplit :: (k -> u -> Bool) -> Set k -> SplitMap k u -> Set k
intersectSetSplit _ IT.Tip _ = IT.Tip
intersectSetSplit p (IT.Bin _ k l r) sp =
case splitLookup k sp of
(sl, Nothing, sr) -> IT.merge (intersectSetSplit p l sl) (intersectSetSplit p r sr)
(sl, Just u, sr) ->
if p k u
then IT.link k (intersectSetSplit p l sl) (intersectSetSplit p r sr)
else IT.merge (intersectSetSplit p l sl) (intersectSetSplit p r sr)
intersectSetSplit p s sm = Set.filter (\k -> maybe False (p k) $ lookup k sm) s

-- | The intersection over the common domain 'k' of a SplitMap and a Data.Map.
-- Only those keys 'k' that meet the predicate 'p' are included.
-- The result isa SplitMap
intersectSplitMap :: (k -> v -> u -> Bool) -> SplitMap k v -> Map.Map k u -> SplitMap k v
intersectSplitMap _ (SplitMap _) Tip = empty
intersectSplitMap p sp (Bin _ k u l r) =
case splitLookup k sp of
(sl, Nothing, sr) -> union (intersectSplitMap p sl l) (intersectSplitMap p sr r)
(sl, Just v, sr) ->
if p k v u
then insert k v (union (intersectSplitMap p sl l) (intersectSplitMap p sr r))
else union (intersectSplitMap p sl l) (intersectSplitMap p sr r)
intersectSplitMap :: Ord k => (k -> v -> u -> Bool) -> SplitMap k v -> Map.Map k u -> SplitMap k v
intersectSplitMap p sm m = filterWithKey (\k v -> maybe False (p k v) $ Map.lookup k m) sm

-- ============================================================================
-- Fold operations
Expand Down