Skip to content

Commit

Permalink
Modify alignment after recent changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@EncodePanda
EncodePanda committed Jan 14, 2021
1 parent 54472c0 commit 5613805
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
16 changes: 8 additions & 8 deletions ouroboros-consensus-test/test-storage/Test/Ouroboros/Storage/ChainDB/StateMachine.hs
View file
Expand Up @@ -342,10 +342,10 @@ run env@ChainDBEnv { varDB, .. } cmd =
IteratorNext it -> IterResult <$> iteratorNext (unWithEq it)
IteratorNextGCed it -> iterResultGCed <$> iteratorNext (unWithEq it)
IteratorClose it -> Unit <$> iteratorClose (unWithEq it)
NewFollower -> follower =<< newFollower registry allComponents
FollowerInstruction rdr -> MbChainUpdate <$> followerInstruction (unWithEq rdr)
FollowerForward rdr pts -> MbPoint <$> followerForward (unWithEq rdr) pts
FollowerClose rdr -> Unit <$> followerClose (unWithEq rdr)
NewFollower -> follower =<< newFollower registry allComponents
FollowerInstruction rdr -> MbChainUpdate <$> followerInstruction (unWithEq rdr)
FollowerForward rdr pts -> MbPoint <$> followerForward (unWithEq rdr) pts
FollowerClose rdr -> Unit <$> followerClose (unWithEq rdr)
Close -> Unit <$> close st
Reopen -> Unit <$> reopen env
RunBgTasks -> ignore <$> runBgTasks internal
Expand Down Expand Up @@ -557,10 +557,10 @@ runPure cfg = \case
IteratorNext it -> ok IterResult $ update (Model.iteratorNext it allComponents)
IteratorNextGCed it -> ok iterResultGCed $ update (Model.iteratorNext it allComponents)
IteratorClose it -> ok Unit $ update_ (Model.iteratorClose it)
NewFollower -> ok Rdr $ update Model.newFollower
FollowerInstruction rdr -> err MbChainUpdate $ updateE (Model.followerInstruction rdr allComponents)
FollowerForward rdr pts -> err MbPoint $ updateE (Model.followerForward rdr pts)
FollowerClose rdr -> ok Unit $ update_ (Model.followerClose rdr)
NewFollower -> ok Rdr $ update Model.newFollower
FollowerInstruction rdr -> err MbChainUpdate $ updateE (Model.followerInstruction rdr allComponents)
FollowerForward rdr pts -> err MbPoint $ updateE (Model.followerForward rdr pts)
FollowerClose rdr -> ok Unit $ update_ (Model.followerClose rdr)
RunBgTasks -> ok Unit $ update_ (Model.garbageCollect k . Model.copyToImmutableDB k)
Close -> openOrClosed $ update_ Model.closeDB
Reopen -> openOrClosed $ update_ Model.reopen
Expand Down
6 changes: 3 additions & 3 deletions ouroboros-consensus/src/Ouroboros/Consensus/Storage/ChainDB/Impl.hs
View file
Expand Up @@ -166,11 +166,11 @@ openDBInternal args launchBgTasks = do
, cdbLgrDB = lgrDB
, cdbChain = varChain
, cdbIterators = varIterators
, cdbFollowers = varFollowers
, cdbFollowers = varFollowers
, cdbTopLevelConfig = cfg
, cdbInvalid = varInvalid
, cdbNextIteratorKey = varNextIteratorKey
, cdbNextFollowerKey = varNextFollowerKey
, cdbNextFollowerKey = varNextFollowerKey
, cdbCopyLock = varCopyLock
, cdbTracer = tracer
, cdbTraceLedger = Args.cdbTraceLedger args
Expand All @@ -197,7 +197,7 @@ openDBInternal args launchBgTasks = do
, getIsValid = getEnvSTM h Query.getIsValid
, getMaxSlotNo = getEnvSTM h Query.getMaxSlotNo
, stream = Iterator.stream h
, newFollower = Follower.newFollower h
, newFollower = Follower.newFollower h
, getIsInvalidBlock = getEnvSTM h Query.getIsInvalidBlock
, closeDB = closeDB h
, isOpen = isOpen h
Expand Down
6 changes: 3 additions & 3 deletions ouroboros-consensus/src/Ouroboros/Consensus/Storage/ChainDB/Impl/Types.hs
View file
Expand Up @@ -201,7 +201,7 @@ data ChainDbEnv m blk = CDB
-- ChainDB: the open file handles used by iterators can be closed, and the
-- iterators themselves are closed so that it is impossible to use an
-- iterator after closing the ChainDB itself.
, cdbFollowers :: !(StrictTVar m (Map FollowerKey (FollowerHandle m blk)))
, cdbFollowers :: !(StrictTVar m (Map FollowerKey (FollowerHandle m blk)))
-- ^ The followers.
--
-- A follower is open iff its 'FollowerKey' is this 'Map'.
Expand All @@ -216,7 +216,7 @@ data ChainDbEnv m blk = CDB
-- The 'Fingerprint' changes every time a hash is added to the map, but
-- not when hashes are garbage-collected from the map.
, cdbNextIteratorKey :: !(StrictTVar m IteratorKey)
, cdbNextFollowerKey :: !(StrictTVar m FollowerKey)
, cdbNextFollowerKey :: !(StrictTVar m FollowerKey)
, cdbCopyLock :: !(StrictMVar m ())
-- ^ Lock used to ensure that 'copyToImmutableDB' is not executed more than
-- once concurrently.
Expand Down Expand Up @@ -479,7 +479,7 @@ getBlockToAdd (BlocksToAdd queue) = atomically $ readTBQueue queue
-- | Trace type for the various events of the ChainDB.
data TraceEvent blk
= TraceAddBlockEvent (TraceAddBlockEvent blk)
| TraceFollowerEvent (TraceFollowerEvent blk)
| TraceFollowerEvent (TraceFollowerEvent blk)
| TraceCopyToImmutableDBEvent (TraceCopyToImmutableDBEvent blk)
| TraceGCEvent (TraceGCEvent blk)
| TraceInitChainSelEvent (TraceInitChainSelEvent blk)
Expand Down
3 changes: 1 addition & 2 deletions ouroboros-network/protocol-tests/Test/ChainProducerState.hs
View file
Expand Up @@ -46,7 +46,6 @@ tests =
, testProperty "switch fork" prop_switchFork
]


--
-- Properties
--
Expand Down Expand Up @@ -177,7 +176,7 @@ prop_switchFork (ChainProducerStateForkTest cps f) =
data ChainProducerStateTest
= ChainProducerStateTest
(ChainProducerState Block) -- ^ producer state with a single follower
FollowerId -- ^ follower's id
FollowerId -- ^ follower's id
(Point Block) -- ^ intersection point of the follower
deriving Show

Expand Down

0 comments on commit 5613805

Please sign in to comment.