Skip to content

Commit 1018e92

Browse files
epostmarcosh
authored andcommitted
[#328] [stbx-core, stbx-proto] Replace emptyMarking by mempty.
1 parent fdde102 commit 1018e92

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

stbx-protocol/src/Statebox/Protocol.purs

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import Data.Either.Nested (type (\/))
66
import Data.Lens ((^?))
77
import Data.Maybe (Maybe(..), maybe)
88

9-
import Data.Petrinet.Representation.Marking (emptyMarking)
109
import Statebox.Core.Lenses (_firingExecution)
1110
import Statebox.Core.Transaction (FiringTx, HashStr, HashTx, InitialTx, TxId, TxSum(..), WiringTx, evalTxSum, isInitialTx, isUberRootHash)
1211
import Statebox.Protocol.Fire (fire)
@@ -119,7 +118,7 @@ processInitialFiringTx hash firingTx = do
119118
, wiring: firingTx.previous
120119
, marking: newMarking
121120
})
122-
(fire wiringTx.wiring firingTx.firing emptyMarking)
121+
(fire wiringTx.wiring firingTx.firing mempty)
123122
)
124123
(const $ pure $ Left $ FiringInitialPreviousShouldBeWiring hash)
125124
previous
@@ -147,9 +146,9 @@ processNormalFiringTx hash firingTx executionHash = do
147146
(\newMarking -> map Right $ do
148147
Store.putTransaction hash $ FiringTxInj firingTx
149148
Store.updateExecutionState executionHash { lastFiring: hash
150-
, wiring: execution.wiring
151-
, marking: newMarking
152-
})
149+
, wiring: execution.wiring
150+
, marking: newMarking
151+
})
153152
(fire wiringTx.wiring firingTx.firing execution.marking))
154153
(const $ pure $ Left $ FiringNormalExecutionWiringShouldBeAWiring hash executionHash)
155154
transaction

studio-common/src/Data/Petrinet/Representation/Marking.purs

-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ module Data.Petrinet.Representation.Marking
66
, toUnfoldable
77
, tokensAt
88
, findTokens
9-
, emptyMarking
109
) where
1110

1211
import Prelude hiding ((-))
@@ -40,9 +39,6 @@ toMap (BagF dict) = dict
4039
tokensAt :: forall a n. Ord a => BagF a n -> a -> Maybe n
4140
tokensAt = Bag.lookup'
4241

43-
emptyMarking :: a n. BagF a n
44-
emptyMarking = BagF Map.empty
45-
4642
--------------------------------------------------------------------------------
4743

4844
findTokens

0 commit comments

Comments
 (0)