From ee1491ab51a19492160339e733d0b58c7bca0e68 Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Wed, 24 Oct 2018 10:06:22 -0400
Subject: [PATCH] Fix namespaceScope.

---
 test/SpecHelpers.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/SpecHelpers.hs b/test/SpecHelpers.hs
index 32d3911ae..71dec5e67 100644
--- a/test/SpecHelpers.hs
+++ b/test/SpecHelpers.hs
@@ -155,11 +155,12 @@ namespaceScope heap ns@(Namespace _ _ _)
   = either (const Nothing) (snd . snd)
   . run
   . runFresh
+  . runEvaluator
   . runAddressError
-  . runState heap
-  . runState (lowerBound @Span)
-  . runReader (lowerBound @Span)
-  . runReader (ModuleInfo "SpecHelper.hs")
+  . raiseHandler (runState heap)
+  . raiseHandler (runState (lowerBound @Span))
+  . raiseHandler (runReader (lowerBound @Span))
+  . raiseHandler (runReader (ModuleInfo "SpecHelper.hs"))
   . runDeref
   $ materializeEnvironment ns