SCP-2668: Delete unused fields

IntersectMBO · Sep 15, 2021 · c32e251 · c32e251
1 parent 1f25899
commit c32e251
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 37 deletions.
diff --git a/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs b/plutus-pab/src/Plutus/PAB/Core/ContractInstance.hs
@@ -363,11 +363,10 @@ updateState ContractResponse{newState = State{observableState}, hooks} = do
         InstanceState.clearEndpoints state
         forM_ hooks $ \r -> do
             case rqRequest r of
-                AwaitTxStatusChangeReq txid -> InstanceState.addTransaction txid state
-                ExposeEndpointReq endpoint  -> InstanceState.addEndpoint (r { rqRequest = endpoint}) state
-                AwaitUtxoSpentReq txOutRef  -> InstanceState.addUtxoSpentReq (r { rqRequest = txOutRef }) state
-                AwaitUtxoProducedReq addr   -> InstanceState.addUtxoProducedReq (r { rqRequest = addr }) state
-                _                           -> pure ()
+                ExposeEndpointReq endpoint -> InstanceState.addEndpoint (r { rqRequest = endpoint}) state
+                AwaitUtxoSpentReq txOutRef -> InstanceState.addUtxoSpentReq (r { rqRequest = txOutRef }) state
+                AwaitUtxoProducedReq addr  -> InstanceState.addUtxoProducedReq (r { rqRequest = addr }) state
+                _                          -> pure ()
         InstanceState.setObservableState observableState state
 
 -- | Run the STM-based request handler on a non-empty list

diff --git a/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs b/plutus-pab/src/Plutus/PAB/Core/ContractInstance/STM.hs
@@ -28,8 +28,6 @@ module Plutus.PAB.Core.ContractInstance.STM(
     , waitForUtxoSpent
     , addUtxoProducedReq
     , waitForUtxoProduced
-    , addAddress
-    , addTransaction
     , setActivity
     , setObservableState
     , openEndpoints
@@ -40,8 +38,6 @@ module Plutus.PAB.Core.ContractInstance.STM(
     , InstancesState
     , emptyInstancesState
     , insertInstance
-    , watchedAddresses
-    , watchedTransactions
     , callEndpointOnInstance
     , callEndpointOnInstanceTimeout
     , observableContractState
@@ -65,7 +61,6 @@ import           Data.List.NonEmpty          (NonEmpty)
 import           Data.Map                    (Map)
 import qualified Data.Map                    as Map
 import           Data.Set                    (Set)
-import qualified Data.Set                    as Set
 import           Ledger                      (Address, Slot, TxId, TxOutRef, txOutTxOut, txOutValue)
 import           Ledger.AddressMap           (AddressMap)
 import qualified Ledger.AddressMap           as AM
@@ -205,8 +200,6 @@ data Activity =
 data InstanceState =
     InstanceState
         { issEndpoints       :: TVar (Map (RequestID, IterationID) OpenEndpoint) -- ^ Open endpoints that can be responded to.
-        , issAddresses       :: TVar (Set Address) -- ^ Addresses that the contract wants to watch -- FIXME: Delete?
-        , issTransactions    :: TVar (Set TxId) -- ^ Transactions whose status the contract is interested in
         , issStatus          :: TVar Activity -- ^ Whether the instance is still running.
         , issObservableState :: TVar (Maybe Value) -- ^ Serialised observable state of the contract instance (if available)
         , issStop            :: TMVar () -- ^ Stop the instance if a value is written into the TMVar.
@@ -219,8 +212,6 @@ emptyInstanceState :: STM InstanceState
 emptyInstanceState =
     InstanceState
         <$> STM.newTVar mempty
-        <*> STM.newTVar mempty
-        <*> STM.newTVar mempty
         <*> STM.newTVar Active
         <*> STM.newTVar Nothing
         <*> STM.newEmptyTMVar
@@ -255,15 +246,6 @@ instanceClientEnv InstanceState{issTxOutRefs, issAddressRefs} =
     <$> (Map.fromList . fmap ((\r@OpenTxOutSpentRequest{osrOutRef} -> (osrOutRef, [r])) . snd) . Map.toList <$> STM.readTVar issTxOutRefs)
     <*> (Map.fromList . fmap ((\r@OpenTxOutProducedRequest{otxAddress} -> (otxAddress, [r])) . snd) . Map.toList  <$> STM.readTVar issAddressRefs)
 
--- | Add an address to the set of addresses that the instance is watching
-addAddress :: Address -> InstanceState -> STM ()
-addAddress addr InstanceState{issAddresses} = STM.modifyTVar issAddresses (Set.insert addr)
-
--- | Add a transaction hash to the set of transactions that the instance is
---   interested in
-addTransaction :: TxId -> InstanceState -> STM ()
-addTransaction txid InstanceState{issTransactions} = STM.modifyTVar issTransactions (Set.insert txid)
-
 -- | Set the 'Activity' of the instance
 setActivity :: Activity -> InstanceState -> STM ()
 setActivity a InstanceState{issStatus} = STM.writeTVar issStatus a
@@ -404,20 +386,6 @@ finalResult instanceId m = do
 insertInstance :: ContractInstanceId -> InstanceState -> InstancesState -> STM ()
 insertInstance instanceID state (InstancesState m) = STM.modifyTVar m (Map.insert instanceID state)
 
--- | The addresses that are currently watched by the contract instances
-watchedAddresses :: InstancesState -> STM (Set Address)
-watchedAddresses (InstancesState m) = do
-    mp <- STM.readTVar m
-    allSets <- traverse (STM.readTVar . issAddresses) (snd <$> Map.toList mp)
-    pure $ fold allSets
-
--- | The transactions that are currently watched by the contract instances
-watchedTransactions :: InstancesState -> STM (Set TxId)
-watchedTransactions (InstancesState m) = do
-    mp <- STM.readTVar m
-    allSets <- traverse (STM.readTVar . issTransactions) (snd <$> Map.toList mp)
-    pure $ fold allSets
-
 -- | Wait for the status of a transaction to change.
 waitForTxStatusChange :: TxStatus -> TxId -> BlockchainEnv -> STM TxStatus
 waitForTxStatusChange oldStatus tx BlockchainEnv{beTxChanges, beCurrentBlock} = do