[ADP-3229] Merge conversions lib into primitive lib (#4262)

- [x] integrate conversions lib into primitive as needed by read conversions ADP-3229
cardano-foundation · Nov 23, 2023 · 2705870 · 2705870
2 parents 447f428 + 7ce1aa3
commit 2705870
Show file tree

Hide file tree

Showing 34 changed files with 114 additions and 217 deletions.
diff --git a/cabal.project b/cabal.project
@@ -63,7 +63,6 @@ packages:
   , lib/cardano-api-extra/
   , lib/crypto-hash-extra/
   , lib/coin-selection/
-  , lib/conversions/
   , lib/customer-deposit-wallet/
   , lib/delta-store/
   , lib/delta-table

diff --git a/lib/balance-tx/cardano-balance-tx.cabal b/lib/balance-tx/cardano-balance-tx.cabal
@@ -64,7 +64,6 @@ library internal
     , cardano-ledger-shelley
     , cardano-slotting
     , cardano-strict-containers
-    , cardano-wallet-conversions
     , cardano-wallet-primitive
     , cardano-wallet-test-utils
     , cborg

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs
@@ -282,10 +282,10 @@ import qualified Cardano.Ledger.Keys as Ledger
 import qualified Cardano.Ledger.Shelley.API.Wallet as Shelley
 import qualified Cardano.Ledger.Shelley.UTxO as Shelley
 import qualified Cardano.Ledger.TxIn as Ledger
+import qualified Cardano.Wallet.Primitive.Convert as Convert
 import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W
     ( txOutMaxCoin
     )
-import qualified Cardano.Wallet.Shelley.Compatibility.Ledger as Convert
 import qualified Data.Map as Map
 
 --------------------------------------------------------------------------------

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs
@@ -291,6 +291,7 @@ import qualified Cardano.Api.Shelley as CardanoApi
 import qualified Cardano.CoinSelection.UTxOIndex as UTxOIndex
 import qualified Cardano.CoinSelection.UTxOSelection as UTxOSelection
 import qualified Cardano.Ledger.Core as Core
+import qualified Cardano.Wallet.Primitive.Convert as Convert
 import qualified Cardano.Wallet.Primitive.Types.Address as W
     ( Address
     )
@@ -325,7 +326,6 @@ import qualified Cardano.Wallet.Primitive.Types.UTxO as W.UTxO
 import qualified Cardano.Wallet.Primitive.Types.UTxO as W
     ( UTxO (..)
     )
-import qualified Cardano.Wallet.Shelley.Compatibility.Ledger as Convert
 import qualified Data.Foldable as F
 import qualified Data.List as L
 import qualified Data.Map as Map

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/TokenBundleSize.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance/TokenBundleSize.hs
@@ -35,13 +35,13 @@ import Internal.Cardano.Write.Tx
     , Version
     )
 
+import qualified Cardano.Wallet.Primitive.Convert as Convert
 import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W
     ( TokenBundle
     )
 import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W
     ( TxSize (..)
     )
-import qualified Cardano.Wallet.Shelley.Compatibility.Ledger as Convert
 import qualified Data.ByteString.Lazy as BL
 
 -- | Assesses a token bundle size in relation to the maximum size that can be

diff --git a/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Sign.hs b/lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Sign.hs
@@ -74,13 +74,13 @@ import qualified Cardano.Api.Byron as CardanoApi
 import qualified Cardano.Api.Shelley as CardanoApi
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
 import qualified Cardano.Ledger.Api as Ledger
+import qualified Cardano.Wallet.Primitive.Convert as Convert
 import qualified Cardano.Wallet.Primitive.Types.Coin as W
     ( Coin (..)
     )
 import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W
     ( TxSize (..)
     )
-import qualified Cardano.Wallet.Shelley.Compatibility.Ledger as Convert
 import qualified Data.Foldable as F
 import qualified Data.List as L
 import qualified Data.Map as Map

diff --git a/lib/conversions/cardano-wallet-conversions.cabal b/lib/conversions/cardano-wallet-conversions.cabal
diff --git a/lib/conversions/test/spec/Spec.hs b/lib/conversions/test/spec/Spec.hs
diff --git a/lib/conversions/test/spec/SpecHook.hs b/lib/conversions/test/spec/SpecHook.hs
diff --git a/lib/conversions/test/spec/run-test-suite.hs b/lib/conversions/test/spec/run-test-suite.hs
diff --git a/lib/primitive/cardano-wallet-primitive.cabal b/lib/primitive/cardano-wallet-primitive.cabal
@@ -1,15 +1,15 @@
-cabal-version:      3.0
-name:               cardano-wallet-primitive
-version:            2023.7.18
-synopsis:           Selected primitive types for Cardano Wallet.
-description:        Please see README.md.
-homepage:           https://github.com/cardano-foundation/cardano-wallet
-author:             Cardano Foundation (High Assurance Lab)
-maintainer:         [email protected]
-copyright:          2018-2022 IOHK, 2023 Cardano Foundation
-license:            Apache-2.0
-category:           Web
-build-type:         Simple
+cabal-version: 3.0
+name:          cardano-wallet-primitive
+version:       2023.7.18
+synopsis:      Selected primitive types for Cardano Wallet.
+description:   Please see README.md.
+homepage:      https://github.com/cardano-foundation/cardano-wallet
+author:        Cardano Foundation (High Assurance Lab)
+maintainer:    [email protected]
+copyright:     2018-2022 IOHK, 2023 Cardano Foundation
+license:       Apache-2.0
+category:      Web
+build-type:    Simple
 
 common language
   default-language:   Haskell2010
@@ -37,7 +37,6 @@ flag release
 library
   import:          language, opts-lib
   hs-source-dirs:  lib
-
   build-depends:
     , aeson
     , base
@@ -46,20 +45,28 @@ library
     , binary
     , bytestring
     , cardano-addresses
-    , cardano-binary
     , cardano-api
+    , cardano-binary
     , cardano-crypto
+    , cardano-crypto-class
+    , cardano-ledger-allegra
+    , cardano-ledger-alonzo
+    , cardano-ledger-babbage
+    , cardano-ledger-core
+    , cardano-ledger-mary
+    , cardano-ledger-shelley
     , cardano-numeric
     , cardano-slotting
+    , cardano-strict-containers
     , cardano-wallet-read
     , cardano-wallet-test-utils
     , cborg
     , commutative-semigroups
-    , contra-tracer
     , containers
+    , contra-tracer
     , cryptonite
-    , delta-types
     , deepseq
+    , delta-types
     , errors
     , extra
     , fmt
@@ -79,6 +86,7 @@ library
     , nothunks
     , OddWord
     , ouroboros-consensus
+    , ouroboros-consensus-cardano
     , pretty-simple
     , QuickCheck
     , quiet
@@ -96,6 +104,7 @@ library
   exposed-modules:
     Cardano.Wallet.Orphans
     Cardano.Wallet.Primitive.Collateral
+    Cardano.Wallet.Primitive.Convert
     Cardano.Wallet.Primitive.NetworkId
     Cardano.Wallet.Primitive.Slotting
     Cardano.Wallet.Primitive.Slotting.Legacy
@@ -166,6 +175,8 @@ test-suite test
     , base58-bytestring
     , binary
     , bytestring
+    , cardano-addresses
+    , cardano-ledger-allegra:{cardano-ledger-allegra, testlib}
     , cardano-ledger-byron-test
     , cardano-ledger-core:{cardano-ledger-core, testlib}
     , cardano-ledger-shelley-test
@@ -174,9 +185,9 @@ test-suite test
     , cardano-wallet-primitive
     , cardano-wallet-test-utils
     , containers
+    , deepseq
     , delta-store
     , delta-types
-    , deepseq
     , filepath
     , fmt
     , generic-arbitrary
@@ -188,6 +199,7 @@ test-suite test
     , lattices
     , MonadRandom
     , ouroboros-consensus
+    , ouroboros-consensus-cardano
     , QuickCheck
     , quickcheck-classes
     , quickcheck-instances
@@ -201,9 +213,11 @@ test-suite test
     , transformers
     , unliftio
     , with-utf8
+
   build-tool-depends: hspec-discover:hspec-discover
   other-modules:
     Cardano.Wallet.Primitive.CollateralSpec
+    Cardano.Wallet.Primitive.ConvertSpec
     Cardano.Wallet.Primitive.SlottingSpec
     Cardano.Wallet.Primitive.SyncProgressSpec
     Cardano.Wallet.Primitive.Types.AddressSpec

diff --git a/...no/Wallet/Shelley/Compatibility/Ledger.hs → ...e/lib/Cardano/Wallet/Primitive/Convert.hs b/...no/Wallet/Shelley/Compatibility/Ledger.hs → ...e/lib/Cardano/Wallet/Primitive/Convert.hs
@@ -12,7 +12,7 @@
 -- Exposes a wallet-friendly interface to types and functions exported by the
 -- ledger specification.
 --
-module Cardano.Wallet.Shelley.Compatibility.Ledger
+module Cardano.Wallet.Primitive.Convert
     (
       -- * Conversions from wallet types to ledger specification types
       toLedgerAddress

diff --git a/...allet/Shelley/Compatibility/LedgerSpec.hs → ...c/Cardano/Wallet/Primitive/ConvertSpec.hs b/...allet/Shelley/Compatibility/LedgerSpec.hs → ...c/Cardano/Wallet/Primitive/ConvertSpec.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Cardano.Wallet.Shelley.Compatibility.LedgerSpec
+module Cardano.Wallet.Primitive.ConvertSpec
     ( spec
     ) where
 
@@ -14,6 +14,11 @@ import Cardano.Address.Script
     , KeyRole (..)
     , Script (..)
     )
+import Cardano.Wallet.Primitive.Convert
+    ( Convert (..)
+    , toLedgerTimelockScript
+    , toWalletScript
+    )
 import Cardano.Wallet.Primitive.Types.Coin
     ( Coin (..)
     )
@@ -50,11 +55,6 @@ import Cardano.Wallet.Primitive.Types.Tx.TxOut.Gen
     ( genTxOutCoin
     , shrinkTxOutCoin
     )
-import Cardano.Wallet.Shelley.Compatibility.Ledger
-    ( Convert (..)
-    , toLedgerTimelockScript
-    , toWalletScript
-    )
 import Data.Proxy
     ( Proxy (..)
     )
@@ -93,7 +93,7 @@ import Test.QuickCheck
 import qualified Data.ByteString as BS
 
 spec :: Spec
-spec = describe "Cardano.Wallet.Shelley.Compatibility.LedgerSpec" $
+spec = describe "Cardano.Wallet.Primitive.ConvertSpec" $
 
     modifyMaxSuccess (const 1000) $ do
 

diff --git a/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Error.hs b/lib/wallet/api/http/Cardano/Wallet/Api/Http/Server/Error.hs
@@ -101,18 +101,18 @@ import Cardano.Wallet.Api.Types.Error
     , ApiErrorSharedWalletNoSuchCosigner (..)
     , ApiErrorTxOutputLovelaceInsufficient (..)
     )
+import Cardano.Wallet.Primitive.Convert
+    ( Convert (toWallet)
+    , toWalletAddress
+    , toWalletCoin
+    , toWalletTokenBundle
+    )
 import Cardano.Wallet.Primitive.Slotting
     ( PastHorizonException
     )
 import Cardano.Wallet.Primitive.Types.TokenMap
     ( Flat (..)
     )
-import Cardano.Wallet.Shelley.Compatibility.Ledger
-    ( Convert (toWallet)
-    , toWalletAddress
-    , toWalletCoin
-    , toWalletTokenBundle
-    )
 import Cardano.Wallet.Transaction
     ( ErrSignTx (..)
     )