plutus-pab: Housekeeping for WBE integration

j-mueller · j-mueller · commit 7ce4d4988f34 · 2021-09-20T16:22:03.000+02:00
* Add cardano-wallet to cabal.project
* Move modules around in plutus-pab
diff --git a/cabal.project b/cabal.project
@@ -120,6 +120,24 @@ source-repository-package
     cardano-prelude
     cardano-prelude-test
 
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-addresses
+  tag: d2f86caa085402a953920c6714a0de6a50b655ec
+  subdir:
+    core
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-wallet.git
+  tag: ae7569293e94241ef6829139ec02bd91abd069df
+  subdir:
+    lib/text-class
+    lib/strict-non-empty-containers
+    lib/core
+    lib/test-utils
+    lib/numeric
+
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
@@ -138,6 +156,7 @@ source-repository-package
     io-sim
     io-classes
     network-mux
+    ntp-client
 
 source-repository-package
   type: git
diff --git a/marlowe-dashboard-client/src/API/Wallet.purs b/marlowe-dashboard-client/src/API/Wallet.purs
@@ -9,7 +9,7 @@ module API.Wallet
 import Prelude
 import API.Request (doGetRequest, doEmptyPostRequest, doPostRequest)
 import API.Url (toUrlPiece)
-import Cardano.Wallet.Types (WalletInfo)
+import Cardano.Wallet.Mock.Types (WalletInfo)
 import Control.Monad.Error.Class (class MonadError)
 import Data.Json.JsonTuple (JsonTuple)
 import Data.Map (Map)
diff --git a/marlowe-dashboard-client/src/Bridge.purs b/marlowe-dashboard-client/src/Bridge.purs
@@ -6,7 +6,7 @@ module Bridge
   ) where
 
 import Prelude
-import Cardano.Wallet.Types (WalletInfo(..)) as Back
+import Cardano.Wallet.Mock.Types (WalletInfo(..)) as Back
 import Data.Bifunctor (bimap)
 import Data.BigInteger (BigInteger)
 import Data.Either (Either)
diff --git a/marlowe/test/Spec/PAB/Workflow.hs b/marlowe/test/Spec/PAB/Workflow.hs
@@ -7,8 +7,8 @@
 
 module Spec.PAB.Workflow where
 
-import           Cardano.Wallet.Client               (createWallet)
-import           Cardano.Wallet.Types                (wiPubKeyHash, wiWallet)
+import           Cardano.Wallet.Mock.Client          (createWallet)
+import           Cardano.Wallet.Mock.Types           (wiPubKeyHash, wiWallet)
 import           Control.Concurrent.Async            (async)
 import           Control.Monad                       (guard, join, void)
 import qualified Data.Aeson                          as Aeson
@@ -39,7 +39,7 @@ import           Wallet.Types                        (ContractInstanceId (..), E
 
 import           Network.Socket                      (withSocketsDo)
 
-import qualified Cardano.Wallet.Types                as Wallet.Types
+import qualified Cardano.Wallet.Mock.Types           as Wallet.Types
 import           Control.Concurrent                  (threadDelay)
 import           Data.Aeson                          (decode)
 import           Data.ByteString.Builder             (toLazyByteString)
diff --git a/plutus-pab/README.md b/plutus-pab/README.md
@@ -188,9 +188,9 @@ Plutus specific wallet implementation for managing user funds on the blockchain.
 
 #### Source
 
-- [Cardano.Wallet.API](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/API.hs)
-- [Cardano.Wallet.Server.main](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/Server.hs#L101)
-- [Cardano.Wallet.Types.Config](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/Types.hs#L47)
+- [Cardano.Wallet.Mock.API](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/API.hs)
+- [Cardano.Wallet.Mock.Server.main](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/Server.hs#L101)
+- [Cardano.Wallet.Mock.Types.Config](https://github.com/input-output-hk/plutus/blob/master/plutus-pab/src/Cardano/Wallet/Types.hs#L47)
 
 ### webserver
 
diff --git a/plutus-pab/plutus-pab.cabal b/plutus-pab/plutus-pab.cabal
@@ -72,11 +72,11 @@ library
         Cardano.Protocol.Socket.Mock.Server
         Cardano.Protocol.Socket.Client
         Cardano.Protocol.Socket.Type
-        Cardano.Wallet.API
-        Cardano.Wallet.Client
-        Cardano.Wallet.Mock
-        Cardano.Wallet.Server
-        Cardano.Wallet.Types
+        Cardano.Wallet.Mock.API
+        Cardano.Wallet.Mock.Client
+        Cardano.Wallet.Mock.Handlers
+        Cardano.Wallet.Mock.Server
+        Cardano.Wallet.Mock.Types
         Control.Concurrent.Availability
         Control.Concurrent.STM.Extras
         Control.Concurrent.STM.Extras.Stream
diff --git a/plutus-pab/src/Cardano/Wallet/Mock/API.hs b/plutus-pab/src/Cardano/Wallet/Mock/API.hs
@@ -1,11 +1,11 @@
 {-# LANGUAGE DataKinds     #-}
 {-# LANGUAGE TypeOperators #-}
 
-module Cardano.Wallet.API
+module Cardano.Wallet.Mock.API
     ( API
     ) where
 
-import           Cardano.Wallet.Types        (WalletInfo)
+import           Cardano.Wallet.Mock.Types   (WalletInfo)
 import           Ledger                      (Value)
 import           Ledger.Constraints.OffChain (UnbalancedTx)
 import           Ledger.Tx                   (Tx)
diff --git a/plutus-pab/src/Cardano/Wallet/Mock/Client.hs b/plutus-pab/src/Cardano/Wallet/Mock/Client.hs
@@ -6,10 +6,10 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators    #-}
 
-module Cardano.Wallet.Client where
+module Cardano.Wallet.Mock.Client where
 
-import           Cardano.Wallet.API          (API)
-import           Cardano.Wallet.Types        (WalletInfo (..))
+import           Cardano.Wallet.Mock.API     (API)
+import           Cardano.Wallet.Mock.Types   (WalletInfo (..))
 import           Control.Monad               (void)
 import           Control.Monad.Freer
 import           Control.Monad.Freer.Error   (Error, throwError)
diff --git a/plutus-pab/src/Cardano/Wallet/Mock/Handlers.hs b/plutus-pab/src/Cardano/Wallet/Mock/Handlers.hs
@@ -8,7 +8,7 @@
 {-# LANGUAGE TypeOperators     #-}
 {-# OPTIONS_GHC -fno-warn-deprecations #-}
 
-module Cardano.Wallet.Mock
+module Cardano.Wallet.Mock.Handlers
     ( processWalletEffects
     , integer2ByteString32
     , byteString2Integer
@@ -19,7 +19,7 @@ module Cardano.Wallet.Mock
 import           Cardano.BM.Data.Trace               (Trace)
 import qualified Cardano.Node.Client                 as NodeClient
 import qualified Cardano.Protocol.Socket.Mock.Client as MockClient
-import           Cardano.Wallet.Types                (MultiWalletEffect (..), WalletEffects, WalletInfo (..),
+import           Cardano.Wallet.Mock.Types           (MultiWalletEffect (..), WalletEffects, WalletInfo (..),
                                                       WalletMsg (..), Wallets)
 import           Control.Concurrent                  (MVar)
 import           Control.Concurrent.MVar             (putMVar, takeMVar)
diff --git a/plutus-pab/src/Cardano/Wallet/Mock/Server.hs b/plutus-pab/src/Cardano/Wallet/Mock/Server.hs
@@ -8,17 +8,17 @@
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE TypeApplications      #-}
 
-module Cardano.Wallet.Server
+module Cardano.Wallet.Mock.Server
     ( main
     ) where
 
 import           Cardano.BM.Data.Trace               (Trace)
 import           Cardano.ChainIndex.Types            (ChainIndexUrl (..))
 import           Cardano.Node.Client                 as NodeClient
 import qualified Cardano.Protocol.Socket.Mock.Client as MockClient
-import           Cardano.Wallet.API                  (API)
-import           Cardano.Wallet.Mock
-import           Cardano.Wallet.Types                (Port (..), WalletConfig (..), WalletInfo (..), WalletMsg (..),
+import           Cardano.Wallet.Mock.API             (API)
+import           Cardano.Wallet.Mock.Handlers
+import           Cardano.Wallet.Mock.Types           (Port (..), WalletConfig (..), WalletInfo (..), WalletMsg (..),
                                                       WalletUrl (..), Wallets, createWallet, multiWallet)
 import           Control.Concurrent.Availability     (Availability, available)
 import           Control.Concurrent.MVar             (MVar, newMVar)
diff --git a/plutus-pab/src/Cardano/Wallet/Mock/Types.hs b/plutus-pab/src/Cardano/Wallet/Mock/Types.hs
@@ -12,7 +12,7 @@
 {-# LANGUAGE TemplateHaskell   #-}
 {-# LANGUAGE TypeApplications  #-}
 
-module Cardano.Wallet.Types (
+module Cardano.Wallet.Mock.Types (
      -- * effect type for the mock wallet
       WalletEffects
     , Wallets
diff --git a/plutus-pab/src/Plutus/PAB/App.hs b/plutus-pab/src/Plutus/PAB/App.hs
@@ -35,8 +35,8 @@ import           Cardano.Node.Client                            (handleNodeClien
 import qualified Cardano.Node.Client                            as NodeClient
 import           Cardano.Node.Types                             (MockServerConfig (..))
 import qualified Cardano.Protocol.Socket.Mock.Client            as MockClient
-import qualified Cardano.Wallet.Client                          as WalletClient
-import qualified Cardano.Wallet.Types                           as Wallet
+import qualified Cardano.Wallet.Mock.Client                     as WalletClient
+import qualified Cardano.Wallet.Mock.Types                      as Wallet
 import qualified Control.Concurrent.STM                         as STM
 import           Control.Monad.Freer
 import           Control.Monad.Freer.Error                      (handleError, throwError)
diff --git a/plutus-pab/src/Plutus/PAB/Monitoring/PABLogMsg.hs b/plutus-pab/src/Plutus/PAB/Monitoring/PABLogMsg.hs
@@ -29,7 +29,7 @@ import           Cardano.BM.Data.Tracer           (ToObject (..), TracingVerbosi
 import           Cardano.BM.Data.Tracer.Extras    (StructuredLog, Tagged (..), mkObjectStr)
 import           Cardano.ChainIndex.Types         (ChainIndexServerMsg)
 import           Cardano.Node.Types               (MockServerLogMsg)
-import           Cardano.Wallet.Types             (WalletMsg)
+import           Cardano.Wallet.Mock.Types        (WalletMsg)
 import           Data.Aeson.Text                  (encodeToLazyText)
 import qualified Data.Text                        as T
 import           Plutus.Contract.Effects          (PABReq, PABResp)
diff --git a/plutus-pab/src/Plutus/PAB/Run/Cli.hs b/plutus-pab/src/Plutus/PAB/Run/Cli.hs
@@ -27,8 +27,8 @@ import           Cardano.BM.Data.Trace                 (Trace)
 import qualified Cardano.ChainIndex.Server             as ChainIndex
 import qualified Cardano.Node.Server                   as NodeServer
 import           Cardano.Node.Types                    (MockServerConfig (..), NodeMode (..))
-import qualified Cardano.Wallet.Server                 as WalletServer
-import           Cardano.Wallet.Types
+import qualified Cardano.Wallet.Mock.Server            as WalletServer
+import           Cardano.Wallet.Mock.Types
 import           Control.Concurrent                    (takeMVar)
 import           Control.Concurrent.Async              (Async, async, waitAny)
 import           Control.Concurrent.Availability       (Availability, available, starting)
diff --git a/plutus-pab/src/Plutus/PAB/Run/PSGenerator.hs b/plutus-pab/src/Plutus/PAB/Run/PSGenerator.hs
@@ -18,7 +18,7 @@ module Plutus.PAB.Run.PSGenerator
     , pabTypes
     ) where
 
-import           Cardano.Wallet.Types                       (WalletInfo)
+import           Cardano.Wallet.Mock.Types                  (WalletInfo)
 import           Control.Applicative                        ((<|>))
 import           Control.Lens                               (set, (&))
 import           Control.Monad.Freer.Extras.Log             (LogLevel, LogMessage)
diff --git a/plutus-pab/src/Plutus/PAB/Simulator.hs b/plutus-pab/src/Plutus/PAB/Simulator.hs
@@ -69,7 +69,7 @@ module Plutus.PAB.Simulator(
     , waitForValidatedTxCount
     ) where
 
-import qualified Cardano.Wallet.Mock                            as MockWallet
+import qualified Cardano.Wallet.Mock.Handlers                   as MockWallet
 import           Control.Concurrent                             (forkIO)
 import           Control.Concurrent.STM                         (STM, TQueue, TVar)
 import qualified Control.Concurrent.STM                         as STM
diff --git a/plutus-pab/src/Plutus/PAB/Types.hs b/plutus-pab/src/Plutus/PAB/Types.hs
@@ -13,7 +13,7 @@ module Plutus.PAB.Types where
 
 import qualified Cardano.ChainIndex.Types  as ChainIndex
 import           Cardano.Node.Types        (MockServerConfig (..))
-import qualified Cardano.Wallet.Types      as Wallet
+import qualified Cardano.Wallet.Mock.Types as Wallet
 import           Control.Lens.TH           (makePrisms)
 import           Data.Aeson                (FromJSON, ToJSON (..))
 import           Data.Default              (Default, def)
diff --git a/plutus-pab/src/Plutus/PAB/Webserver/API.hs b/plutus-pab/src/Plutus/PAB/Webserver/API.hs
@@ -10,7 +10,7 @@ module Plutus.PAB.Webserver.API
     , WalletProxy
     ) where
 
-import qualified Cardano.Wallet.API         as Wallet
+import qualified Cardano.Wallet.Mock.API    as Wallet
 import qualified Data.Aeson                 as JSON
 import           Data.Text                  (Text)
 import           Plutus.PAB.Webserver.Types (ContractActivationArgs, ContractInstanceClientState,
diff --git a/plutus-pab/src/Plutus/PAB/Webserver/Handler.hs b/plutus-pab/src/Plutus/PAB/Webserver/Handler.hs
@@ -22,8 +22,8 @@ module Plutus.PAB.Webserver.Handler
     , contractSchema
     ) where
 
-import qualified Cardano.Wallet.Client                   as Wallet.Client
-import           Cardano.Wallet.Types                    (WalletInfo (..))
+import qualified Cardano.Wallet.Mock.Client              as Wallet.Client
+import           Cardano.Wallet.Mock.Types               (WalletInfo (..))
 import           Control.Lens                            (preview)
 import           Control.Monad                           ((>=>))
 import           Control.Monad.Freer                     (sendM)
diff --git a/plutus-pab/src/Plutus/PAB/Webserver/Server.hs b/plutus-pab/src/Plutus/PAB/Webserver/Server.hs
@@ -18,7 +18,7 @@ module Plutus.PAB.Webserver.Server
     , startServerDebug'
     ) where
 
-import           Cardano.Wallet.Types                   (WalletInfo (..))
+import           Cardano.Wallet.Mock.Types              (WalletInfo (..))
 import           Control.Concurrent                     (MVar, forkFinally, forkIO, newEmptyMVar, putMVar)
 import           Control.Concurrent.Availability        (Availability, available, newToken)
 import qualified Control.Concurrent.STM                 as STM
diff --git a/plutus-pab/test/full/Plutus/PAB/CliSpec.hs b/plutus-pab/test/full/Plutus/PAB/CliSpec.hs
@@ -24,9 +24,9 @@ import           Cardano.BM.Setup                    (setupTrace_)
 import qualified Cardano.ChainIndex.Types            as ChainIndex.Types
 import           Cardano.Node.Types                  (NodeMode (..))
 import qualified Cardano.Node.Types                  as Node.Types
-import qualified Cardano.Wallet.Client               as Wallet.Client
-import           Cardano.Wallet.Types                (WalletInfo (..))
-import qualified Cardano.Wallet.Types                as Wallet.Types
+import qualified Cardano.Wallet.Mock.Client          as Wallet.Client
+import           Cardano.Wallet.Mock.Types           (WalletInfo (..))
+import qualified Cardano.Wallet.Mock.Types           as Wallet.Types
 import           Control.Concurrent                  (threadDelay)
 import           Control.Concurrent.Async            (async, cancel)
 import           Control.Concurrent.Availability     (available, newToken, starting)
diff --git a/plutus-pab/test/light/Cardano/Wallet/ServerSpec.hs b/plutus-pab/test/light/Cardano/Wallet/ServerSpec.hs
@@ -10,7 +10,7 @@ module Cardano.Wallet.ServerSpec
     ( tests
     ) where
 
-import           Cardano.Wallet.Mock
+import           Cardano.Wallet.Mock.Handlers
 import           Control.Monad                        (replicateM)
 import qualified Data.ByteString                      as BS
 import           Data.Word
