Group UTxO-related modules

cardano-foundation · Apr 25, 2024 · 83fd58b · 83fd58b
1 parent 7970de0
commit 83fd58b
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 45 deletions.
diff --git a/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Everything.agda b/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Everything.agda
@@ -3,4 +3,8 @@ module Cardano.Wallet.Deposit.Everything where
 import Cardano.Wallet.Deposit.Pure
 import Cardano.Wallet.Deposit.Pure.Timeline
 import Cardano.Wallet.Deposit.Pure.TxSummary
-import Cardano.Wallet.Deposit.Pure.ValueTransfer
+
+import Cardano.Wallet.Deposit.Pure.UTxO.Balance
+import Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer
diff --git a/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Pure.agda b/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Pure.agda
@@ -33,26 +33,26 @@ import Cardano.Wallet.Deposit.Pure.Address
     ( Customer
     , AddressState
     )
-import Cardano.Wallet.Deposit.Pure.UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO
     ( UTxO
     )
 import Cardano.Wallet.Deposit.Pure.TxSummary
     ( TxSummary
     )
 import qualified Cardano.Wallet.Deposit.Pure.Address as Addr
-import qualified Cardano.Wallet.Deposit.Pure.Balance as Balance
-import qualified Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.Balance as Balance
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 #-}
 
 open import Cardano.Wallet.Deposit.Pure.Address using
     ( Customer
     ; deriveCustomerAddress
     ; AddressState
     )
-open import Cardano.Wallet.Deposit.Pure.UTxO using
+open import Cardano.Wallet.Deposit.Pure.UTxO.UTxO using
     ( UTxO
     )
-open import Cardano.Wallet.Deposit.Pure.ValueTransfer using
+open import Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer using
     ( ValueTransfer
       ; fromSpent
       ; fromReceived
@@ -91,8 +91,8 @@ open import Haskell.Data.Maybe using
     )
 
 import Cardano.Wallet.Deposit.Pure.Address as Addr
-import Cardano.Wallet.Deposit.Pure.Balance as Balance
-import Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.Balance as Balance
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 import Haskell.Data.Map as Map
 
 -- The import of the cong! tactic slows down type checking…

diff --git a/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Pure/TxSummary.agda b/lib/customer-deposit-wallet-pure/agda/Cardano/Wallet/Deposit/Pure/TxSummary.agda
@@ -2,7 +2,7 @@ module Cardano.Wallet.Deposit.Pure.TxSummary where
 
 open import Haskell.Prelude
 
-open import Cardano.Wallet.Deposit.Pure.ValueTransfer using
+open import Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer using
     ( ValueTransfer
     )
 open import Cardano.Wallet.Deposit.Read using

diff --git a/.../Cardano/Wallet/Deposit/Pure/Balance.agda → ...ano/Wallet/Deposit/Pure/UTxO/Balance.agda b/.../Cardano/Wallet/Deposit/Pure/Balance.agda → ...ano/Wallet/Deposit/Pure/UTxO/Balance.agda
@@ -1,22 +1,22 @@
 {-# OPTIONS --erasure #-}
 
-module Cardano.Wallet.Deposit.Pure.Balance where
+module Cardano.Wallet.Deposit.Pure.UTxO.Balance where
 
 open import Haskell.Prelude
 
-open import Cardano.Wallet.Deposit.Pure.UTxO using
+open import Cardano.Wallet.Deposit.Pure.UTxO.UTxO using
     ( UTxO
     )
-open import Cardano.Wallet.Deposit.Pure.DeltaUTxO using
+open import Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO using
     ( DeltaUTxO
     )
 open import Cardano.Wallet.Deposit.Read using
     ( Tx
     ; TxBody
     )
 
-import Cardano.Wallet.Deposit.Pure.DeltaUTxO as DeltaUTxO
-import Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO as DeltaUTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 import Cardano.Wallet.Deposit.Read as Read
 import Haskell.Data.Map as Map
 import Haskell.Data.Set as Set

diff --git a/...ardano/Wallet/Deposit/Pure/DeltaUTxO.agda → ...o/Wallet/Deposit/Pure/UTxO/DeltaUTxO.agda b/...ardano/Wallet/Deposit/Pure/DeltaUTxO.agda → ...o/Wallet/Deposit/Pure/UTxO/DeltaUTxO.agda
@@ -1,6 +1,6 @@
 {-# OPTIONS --erasure #-}
 
-module Cardano.Wallet.Deposit.Pure.DeltaUTxO
+module Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO
     {-
     ; DeltaUTxO
       ; null
@@ -18,14 +18,14 @@ open import Haskell.Prelude hiding
     )
 open import Haskell.Reasoning
 
-open import Cardano.Wallet.Deposit.Pure.UTxO using
+open import Cardano.Wallet.Deposit.Pure.UTxO.UTxO using
     ( UTxO
     )
 open import Cardano.Wallet.Deposit.Read using
     ( TxIn
     )
 
-import Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 import Haskell.Data.Map as Map
 import Haskell.Data.Set as Set
 

diff --git a/...gda/Cardano/Wallet/Deposit/Pure/UTxO.agda → ...ardano/Wallet/Deposit/Pure/UTxO/UTxO.agda b/...gda/Cardano/Wallet/Deposit/Pure/UTxO.agda → ...ardano/Wallet/Deposit/Pure/UTxO/UTxO.agda
@@ -1,6 +1,6 @@
 {-# OPTIONS --erasure #-}
 
-module Cardano.Wallet.Deposit.Pure.UTxO
+module Cardano.Wallet.Deposit.Pure.UTxO.UTxO
     {-
     ; UTxO
       ; null

diff --git a/...no/Wallet/Deposit/Pure/ValueTransfer.agda → ...llet/Deposit/Pure/UTxO/ValueTransfer.agda b/...no/Wallet/Deposit/Pure/ValueTransfer.agda → ...llet/Deposit/Pure/UTxO/ValueTransfer.agda
@@ -1,4 +1,4 @@
-module Cardano.Wallet.Deposit.Pure.ValueTransfer where
+module Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer where
 
 open import Haskell.Prelude
 

diff --git a/lib/customer-deposit-wallet-pure/agda/Cardano/Write/Tx/Balance.agda b/lib/customer-deposit-wallet-pure/agda/Cardano/Write/Tx/Balance.agda
@@ -15,7 +15,7 @@ module Cardano.Write.Tx.Balance
 open import Haskell.Prelude
 open import Haskell.Reasoning
 
-open import Cardano.Wallet.Deposit.Pure.UTxO using
+open import Cardano.Wallet.Deposit.Pure.UTxO.UTxO using
     ( UTxO
     )
 open import Cardano.Wallet.Deposit.Read using
@@ -30,7 +30,7 @@ open import Cardano.Wallet.Deposit.Read using
 open import Haskell.Data.List.Prop using ( _∈_ )
 open import Haskell.Data.Maybe using ( isJust )
 
-import Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 import Haskell.Data.ByteString as BS
 import Haskell.Data.Map as Map
 

diff --git a/lib/customer-deposit-wallet-pure/customer-deposit-wallet-pure.cabal b/lib/customer-deposit-wallet-pure/customer-deposit-wallet-pure.cabal
@@ -59,12 +59,12 @@ library
   exposed-modules:
     Cardano.Wallet.Deposit.Pure
     Cardano.Wallet.Deposit.Pure.Address
-    Cardano.Wallet.Deposit.Pure.Balance
-    Cardano.Wallet.Deposit.Pure.DeltaUTxO
-    Cardano.Wallet.Deposit.Pure.UTxO
+    Cardano.Wallet.Deposit.Pure.UTxO.Balance
+    Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO
+    Cardano.Wallet.Deposit.Pure.UTxO.UTxO
+    Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer
     Cardano.Wallet.Deposit.Pure.Timeline
     Cardano.Wallet.Deposit.Pure.TxSummary
-    Cardano.Wallet.Deposit.Pure.ValueTransfer
     Cardano.Wallet.Deposit.Read
     Cardano.Write.Tx.Balance
   other-modules:

diff --git a/lib/customer-deposit-wallet-pure/haskell/Cardano/Wallet/Deposit/Pure.hs b/lib/customer-deposit-wallet-pure/haskell/Cardano/Wallet/Deposit/Pure.hs
@@ -9,15 +9,15 @@ import Cardano.Wallet.Deposit.Pure.Address
     ( Customer
     , AddressState
     )
-import Cardano.Wallet.Deposit.Pure.UTxO
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO
     ( UTxO
     )
 import Cardano.Wallet.Deposit.Pure.TxSummary
     ( TxSummary
     )
 import qualified Cardano.Wallet.Deposit.Pure.Address as Addr
-import qualified Cardano.Wallet.Deposit.Pure.Balance as Balance
-import qualified Cardano.Wallet.Deposit.Pure.UTxO as UTxO
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.Balance as Balance
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO
 
 data WalletState = WalletState{addresses :: AddressState,
                                utxo :: UTxO, txSummaries :: Map.Map Customer [TxSummary],

diff --git a/lib/customer-deposit-wallet-pure/haskell/Cardano/Wallet/Deposit/Pure/TxSummary.hs b/lib/customer-deposit-wallet-pure/haskell/Cardano/Wallet/Deposit/Pure/TxSummary.hs
@@ -1,6 +1,6 @@
 module Cardano.Wallet.Deposit.Pure.TxSummary where
 
-import Cardano.Wallet.Deposit.Pure.ValueTransfer (ValueTransfer)
+import Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer (ValueTransfer)
 import Cardano.Wallet.Deposit.Read (ChainPoint(GenesisPoint), Tx(txid), TxId)
 
 data TxSummary = TxSummary{summarizedTx :: TxId,

diff --git a/...ll/Cardano/Wallet/Deposit/Pure/Balance.hs → ...rdano/Wallet/Deposit/Pure/UTxO/Balance.hs b/...ll/Cardano/Wallet/Deposit/Pure/Balance.hs → ...rdano/Wallet/Deposit/Pure/UTxO/Balance.hs
@@ -1,9 +1,9 @@
-module Cardano.Wallet.Deposit.Pure.Balance where
+module Cardano.Wallet.Deposit.Pure.UTxO.Balance where
 
-import Cardano.Wallet.Deposit.Pure.DeltaUTxO (DeltaUTxO)
-import qualified Cardano.Wallet.Deposit.Pure.DeltaUTxO (excludingD, null, receiveD)
-import Cardano.Wallet.Deposit.Pure.UTxO (UTxO)
-import qualified Cardano.Wallet.Deposit.Pure.UTxO as UTxO (filterByAddress, null)
+import Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO (DeltaUTxO)
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO (excludingD, null, receiveD)
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO (UTxO)
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO (filterByAddress, null)
 import Cardano.Wallet.Deposit.Read (Tx(txbody, txid), TxBody(inputs, outputs))
 import qualified Cardano.Wallet.Deposit.Read as Read (Addr, TxIn, TxOut)
 import Data.Set (Set)
@@ -13,7 +13,7 @@ import qualified Haskell.Data.Set as Set (fromList)
 
 spendTxD :: Tx -> UTxO -> (DeltaUTxO, UTxO)
 spendTxD tx u
-  = Cardano.Wallet.Deposit.Pure.DeltaUTxO.excludingD u
+  = Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO.excludingD u
       inputsToExclude
   where
     inputsToExclude :: Set Read.TxIn
@@ -35,15 +35,16 @@ applyTx :: IsOurs Read.Addr -> Tx -> UTxO -> (DeltaUTxO, UTxO)
 applyTx isOurs tx u0
   = if
       UTxO.null (UTxO.filterByAddress isOurs (utxoFromTxOutputs tx)) &&
-        Cardano.Wallet.Deposit.Pure.DeltaUTxO.null (fst (spendTxD tx u0))
+        Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO.null
+          (fst (spendTxD tx u0))
       then (mempty, u0) else
       (fst
-         (Cardano.Wallet.Deposit.Pure.DeltaUTxO.receiveD
+         (Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO.receiveD
             (snd (spendTxD tx u0))
             (UTxO.filterByAddress isOurs (utxoFromTxOutputs tx)))
          <> fst (spendTxD tx u0),
        snd
-         (Cardano.Wallet.Deposit.Pure.DeltaUTxO.receiveD
+         (Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO.receiveD
             (snd (spendTxD tx u0))
             (UTxO.filterByAddress isOurs (utxoFromTxOutputs tx))))
 
diff --git a/.../Cardano/Wallet/Deposit/Pure/DeltaUTxO.hs → ...ano/Wallet/Deposit/Pure/UTxO/DeltaUTxO.hs b/.../Cardano/Wallet/Deposit/Pure/DeltaUTxO.hs → ...ano/Wallet/Deposit/Pure/UTxO/DeltaUTxO.hs
@@ -1,7 +1,7 @@
-module Cardano.Wallet.Deposit.Pure.DeltaUTxO where
+module Cardano.Wallet.Deposit.Pure.UTxO.DeltaUTxO where
 
-import Cardano.Wallet.Deposit.Pure.UTxO (UTxO)
-import qualified Cardano.Wallet.Deposit.Pure.UTxO as UTxO (empty, excluding, excludingS, null, union)
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO (UTxO)
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO (empty, excluding, excludingS, null, union)
 import Cardano.Wallet.Deposit.Read (TxIn)
 import Data.Set (Set)
 import qualified Haskell.Data.Map as Map (empty, keysSet)

diff --git a/...skell/Cardano/Wallet/Deposit/Pure/UTxO.hs → .../Cardano/Wallet/Deposit/Pure/UTxO/UTxO.hs b/...skell/Cardano/Wallet/Deposit/Pure/UTxO.hs → .../Cardano/Wallet/Deposit/Pure/UTxO/UTxO.hs
@@ -1,4 +1,4 @@
-module Cardano.Wallet.Deposit.Pure.UTxO where
+module Cardano.Wallet.Deposit.Pure.UTxO.UTxO where
 
 import Cardano.Wallet.Deposit.Read (Address, TxIn, TxOut(address, value), Value)
 import Data.Set (Set)

diff --git a/...dano/Wallet/Deposit/Pure/ValueTransfer.hs → ...Wallet/Deposit/Pure/UTxO/ValueTransfer.hs b/...dano/Wallet/Deposit/Pure/ValueTransfer.hs → ...Wallet/Deposit/Pure/UTxO/ValueTransfer.hs
@@ -1,4 +1,4 @@
-module Cardano.Wallet.Deposit.Pure.ValueTransfer where
+module Cardano.Wallet.Deposit.Pure.UTxO.ValueTransfer where
 
 import Cardano.Wallet.Deposit.Read (Value)
 

diff --git a/lib/customer-deposit-wallet-pure/haskell/Cardano/Write/Tx/Balance.hs b/lib/customer-deposit-wallet-pure/haskell/Cardano/Write/Tx/Balance.hs
@@ -1,7 +1,7 @@
 module Cardano.Write.Tx.Balance where
 
-import Cardano.Wallet.Deposit.Pure.UTxO (UTxO)
-import qualified Cardano.Wallet.Deposit.Pure.UTxO as UTxO (balance)
+import Cardano.Wallet.Deposit.Pure.UTxO.UTxO (UTxO)
+import qualified Cardano.Wallet.Deposit.Pure.UTxO.UTxO as UTxO (balance)
 import Cardano.Wallet.Deposit.Read (Address, TxBody(TxBodyC), TxIn, TxOut(TxOutC, value), Value, exceeds, minus)
 import qualified Haskell.Data.Map as Map (toAscList)