anoma · lukaszcz · Jul 29, 2025 · Jul 29, 2025
diff --git a/AVM/Class/Translation.lean b/AVM/Class/Translation.lean
@@ -185,15 +185,14 @@ def Intent.logic
   : Bool :=
   -- Check that exactly one resource is created that corresponds to the intent
   match Logic.filterOutDummy args.created with
-  | [intentRes] => BoolCheck.run do
-    let labelData ← BoolCheck.some <| Intent.LabelData.fromResource intentRes
-    BoolCheck.ret <|
-      -- NOTE: We should also check that the intent logic hashes of
-      -- `intentRes` and `intent` match.
-      labelData.label === ilab
-      && intentRes.quantity == 1
-      && intentRes.ephemeral
-      && Logic.checkResourcesData labelData.data.provided args.consumed
+  | [intentRes] =>
+    let try labelData := Intent.LabelData.fromResource intentRes
+    -- NOTE: We should also check that the intent logic hashes of
+    -- `intentRes` and `intent` match.
+    labelData.label === ilab
+    && intentRes.quantity == 1
+    && intentRes.ephemeral
+    && Logic.checkResourcesData labelData.data.provided args.consumed
   | _ =>
     false
 
@@ -207,21 +206,20 @@ def checkClassMemberLogic
   (eco : Ecosystem lab)
   (memberId : classId.label.MemberId)
   (margs : memberId.Args.type)
-  : Bool := BoolCheck.run do
-  let selfObj : Object classId.label ← BoolCheck.some (Object.fromResource args.self)
+  : Bool :=
+  let try selfObj : Object classId.label := Object.fromResource args.self
   let cls : Class classId := eco.classes classId
-  BoolCheck.ret <|
-    cls.invariant selfObj args &&
-    match memberId with
-    | .constructorId c =>
-      Constructor.logic (cls.constructors c) args
-    | .methodId m =>
-      Method.logic (cls.methods m) args
-    | .destructorId m =>
-      Destructor.logic (cls.destructors m) args
-    | .intentId l =>
-      if h : l ∈ classId.label.intentLabels then
-        let intent : Intent l := cls.intents l h
-        Intent.logic intent args
-      else
-        false
+  cls.invariant selfObj args &&
+  match memberId with
+  | .constructorId c =>
+    Constructor.logic (cls.constructors c) args
+  | .methodId m =>
+    Method.logic (cls.methods m) args
+  | .destructorId m =>
+    Destructor.logic (cls.destructors m) args
+  | .intentId l =>
+    if h : l ∈ classId.label.intentLabels then
+      let intent : Intent l := cls.intents l h
+      Intent.logic intent args
+    else
+      false
diff --git a/AVM/Intent/Translation.lean b/AVM/Intent/Translation.lean
@@ -15,23 +15,18 @@ open Ecosystem
   intent logic checks the intent's condition. -/
 def Intent.logic {ilab : Intent.Label} (intent : Intent ilab) (args : Anoma.Logic.Args Unit) : Bool :=
   if args.isConsumed then
-    BoolCheck.run do
-      let data ← BoolCheck.some <| Intent.ResourceData.fromResource args.self
-      let receivedObjects ←
-        BoolCheck.some <|
-          List.mapSome SomeObject.fromResource <|
-          Logic.filterOutDummy args.created
-      let argsData ← BoolCheck.some <| tryCast data.args
-      BoolCheck.ret <|
-        intent.condition argsData data.provided receivedObjects
+    let try data := Intent.ResourceData.fromResource args.self
+    let try receivedObjects :=
+        List.mapSome SomeObject.fromResource <|
+        Logic.filterOutDummy args.created
+    let try argsData := tryCast data.args
+    intent.condition argsData data.provided receivedObjects
   else
     -- In the created case, we need to check that the list of provided objects
     -- corresponds to the list consumed resources. See:
     -- https://github.com/anoma/goose-lean/issues/32.
-    BoolCheck.run do
-      let data ← BoolCheck.some <| Intent.ResourceData.fromResource args.self
-      BoolCheck.ret <|
-        Logic.checkResourcesData data.provided args.consumed
+    let try data := Intent.ResourceData.fromResource args.self
+    Logic.checkResourcesData data.provided args.consumed
 
 /-- An action which consumes the provided objects and creates the intent. This
   is a helper function which handles the random number generator explicitly to

diff --git a/Prelude.lean b/Prelude.lean
@@ -1,5 +1,4 @@
 import Prelude.UUnit
-import Prelude.BoolCheck
 import Prelude.List
 import Prelude.HashMap
 import Prelude.TypeRep

diff --git a/Prelude/BoolCheck.lean b/Prelude/BoolCheck.lean