Zilliqa · vaivaswatha · Oct 18, 2020 · Oct 16, 2020 · Oct 16, 2020 · Oct 18, 2020
diff --git a/src/base/Gas.ml b/src/base/Gas.ml
@@ -220,9 +220,13 @@ module ScillaGas (SR : Rep) (ER : Rep) = struct
           | Iterate (l, _) ->
               let g = GasStmt (GasCharge.LengthOf (GI.get_id l)) in
               pure @@ [ (g, srep); (s, srep) ]
-          | Throw _ ->
-              (* TODO: Throw should charge same as event and send. *)
-              pure @@ [ (s, srep) ]
+          | Throw eopt ->
+              let g =
+                match eopt with
+                | Some e -> GasCharge.SizeOf (GI.get_id e)
+                | None -> GasCharge.StaticCost 1
+              in
+              pure @@ [ (GasStmt g, srep); (s, srep) ]
           | GasStmt _ -> fail0 "Unexpected gas charge"
         in
 

diff --git a/src/eval/Eval.ml b/src/eval/Eval.ml
@@ -49,15 +49,12 @@ let reserved_names =
     RecursionPrinciples.recursion_principles
 
 (* Printing result *)
-let pp_result r exclude_names =
+let pp_result (e, env) exclude_names gas_remaining =
   let enames = List.append exclude_names reserved_names in
-  match r with
-  | Error (s, _) -> sprint_scilla_error_list s
-  | Ok ((e, env), _) ->
-      let filter_prelude (k, _) =
-        not @@ List.mem enames k ~equal:String.( = )
-      in
-      sprintf "%s,\n%s" (Env.pp_value e) (Env.pp ~f:filter_prelude env)
+  let filter_prelude (k, _) = not @@ List.mem enames k ~equal:String.( = ) in
+  sprintf "%s,\n%s\nGas remaining: %s" (Env.pp_value e)
+    (Env.pp ~f:filter_prelude env)
+    (Stdint.Uint64.to_string gas_remaining)
 
 (* Makes sure that the literal has no closures in it *)
 (* TODO: Augment with deep checking *)

diff --git a/src/runners/eval_runner.ml b/src/runners/eval_runner.ml
@@ -64,7 +64,8 @@ let run () =
       let lib_fnames = List.map ~f:(fun (name, _) -> name) env in
       let res = Eval.(exp_eval e env init_gas_kont gas_remaining) in
       match res with
-      | Ok _ -> printf "%s\n" (Eval.pp_result res lib_fnames)
+      | Ok (res', gas_remaining) ->
+          printf "%s\n" (Eval.pp_result res' lib_fnames gas_remaining)
       | Error (el, gas_remaining) -> fatal_error_gas el gas_remaining )
   | Error e -> fatal_error e
 

diff --git a/tests/checker/good/gold/UintParam.scilla.gold b/tests/checker/good/gold/UintParam.scilla.gold
@@ -67,4 +67,5 @@
     }
   ],
   "gas_remaining": "7999"
-}
+}
+
diff --git a/tests/eval/good/gold/ackermann.scilexp.gold b/tests/eval/good/gold/ackermann.scilexp.gold
@@ -51,3 +51,4 @@
   [ackermann -> <closure>],
   [nat_iter -> <type_closure>],
   [nat_succ -> <closure>] }
+Gas remaining: 3930184
diff --git a/tests/eval/good/gold/addr.scilexp.gold b/tests/eval/good/gold/addr.scilexp.gold
@@ -1,3 +1,4 @@
 (False),
 { [b -> (ByStr20 0xafcdeabcde123456789012345678901234567890)],
   [a -> (ByStr20 0xffcdeabcde123456789012345678901234567890)] }
+Gas remaining: 4001733
diff --git a/tests/eval/good/gold/app.scilexp.gold b/tests/eval/good/gold/app.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int64 1)],
   [f -> <closure>],
   [x -> (Int64 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/app2.scilexp.gold b/tests/eval/good/gold/app2.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/app3.scilexp.gold b/tests/eval/good/gold/app3.scilexp.gold
@@ -3,3 +3,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001745
diff --git a/tests/eval/good/gold/app4.scilexp.gold b/tests/eval/good/gold/app4.scilexp.gold
@@ -4,3 +4,4 @@
   [a -> (Int32 1)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001742
diff --git a/tests/eval/good/gold/app5.scilexp.gold b/tests/eval/good/gold/app5.scilexp.gold
@@ -7,3 +7,4 @@
   [a -> (ByStr20 0x1234567890123456789012345678901234abcdef)],
   [bs -> (Map ByStr20 Int32 [])],
   [check_update -> <closure>] }
+Gas remaining: 4001731
diff --git a/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold b/tests/eval/good/gold/builtin-alt-bn128.scilexp.gold
@@ -42,3 +42,4 @@
   [sum_x -> (ByStr32 0x2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703)],
   [p1y -> (ByStr32 0x063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f37266)],
   [p1x -> (ByStr32 0x18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9)] }
+Gas remaining: 3997822
diff --git a/tests/eval/good/gold/builtin-badd.scilexp.gold b/tests/eval/good/gold/builtin-badd.scilexp.gold
@@ -1,3 +1,4 @@
 (BNum 23224456),
 { [b -> (Uint32 1)],
   [a -> (BNum 23224455)] }
+Gas remaining: 4001721
diff --git a/tests/eval/good/gold/builtin-bech32-1.scilexp.gold b/tests/eval/good/gold/builtin-bech32-1.scilexp.gold
@@ -1,3 +1,4 @@
 (Some (ByStr20 0x7aa7ea9f4534d8d70224b9c2fb165242f321f12b)),
 { [prefix -> (String "zil")],
   [bech32str -> (String "zil102n74869xnvdwq3yh8p0k9jjgtejruft268tg8")] }
+Gas remaining: 4001505
diff --git a/tests/eval/good/gold/builtin-bech32-2.scilexp.gold b/tests/eval/good/gold/builtin-bech32-2.scilexp.gold
@@ -1,3 +1,4 @@
 (Some (String "zil102n74869xnvdwq3yh8p0k9jjgtejruft268tg8")),
 { [prefix -> (String "zil")],
   [bystr20_addr -> (ByStr20 0x7aa7ea9f4534d8d70224b9c2fb165242f321f12b)] }
+Gas remaining: 4001593
diff --git a/tests/eval/good/gold/builtin-bsub.scilexp.gold b/tests/eval/good/gold/builtin-bsub.scilexp.gold
@@ -1,3 +1,4 @@
 (Int256 1002233),
 { [b -> (BNum 22222222)],
   [a -> (BNum 23224455)] }
+Gas remaining: 4001721
diff --git a/tests/eval/good/gold/builtin-div.scilexp.gold b/tests/eval/good/gold/builtin-div.scilexp.gold
@@ -8,3 +8,4 @@
   [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001672
diff --git a/tests/eval/good/gold/builtin-div2.scilexp.gold b/tests/eval/good/gold/builtin-div2.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int256 2)],
   [a -> (Int256 9999999999990)],
   [f -> <closure>] }
+Gas remaining: 4001650
diff --git a/tests/eval/good/gold/builtin-div3.scilexp.gold b/tests/eval/good/gold/builtin-div3.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 101)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-div4.scilexp.gold b/tests/eval/good/gold/builtin-div4.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Uint256 2)],
   [a -> (Uint256 9999999999990)],
   [f -> <closure>] }
+Gas remaining: 4001650
diff --git a/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold b/tests/eval/good/gold/builtin-eq-bystr.scilexp.gold
@@ -8,3 +8,4 @@
   [c -> (ByStr2 0x0f0f)],
   [b -> (ByStr2 0xbfbf)],
   [a -> (ByStr2 0x0f0f)] }
+Gas remaining: 4001726
diff --git a/tests/eval/good/gold/builtin-isqrt.scilexp.gold b/tests/eval/good/gold/builtin-isqrt.scilexp.gold
@@ -19,3 +19,4 @@
   [two -> (Uint64 2)],
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)] }
+Gas remaining: 3998130
diff --git a/tests/eval/good/gold/builtin-pow.scilexp.gold b/tests/eval/good/gold/builtin-pow.scilexp.gold
@@ -3,3 +3,4 @@
   [x -> (Int32 10000)],
   [b -> (Uint32 2)],
   [a -> (Int32 100)] }
+Gas remaining: 4001670
diff --git a/tests/eval/good/gold/builtin-rem.scilexp.gold b/tests/eval/good/gold/builtin-rem.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-rem2.scilexp.gold b/tests/eval/good/gold/builtin-rem2.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 23)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-rem3.scilexp.gold b/tests/eval/good/gold/builtin-rem3.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Uint32 23)],
   [a -> (Uint32 100)],
   [f -> <closure>] }
+Gas remaining: 4001722
diff --git a/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold b/tests/eval/good/gold/builtin-schnorr_get_address.scilexp.gold
@@ -35,3 +35,4 @@
   [a1_gen -> (ByStr20 0x4baf5fada8e5db92c3d3242618c5b47133ae003c)],
   [a1 -> (ByStr20 0x4baf5fada8e5db92c3d3242618c5b47133ae003c)],
   [p1 -> (ByStr33 0x0314738163b9bb67ad11aa464fe69a1147df263e8970d7dcfd8f993ddd39e81bd9)] }
+Gas remaining: 4001513
diff --git a/tests/eval/good/gold/builtin-strings.scilexp.gold b/tests/eval/good/gold/builtin-strings.scilexp.gold
@@ -28,3 +28,4 @@
   [fsubstr -> <closure>],
   [fconcat -> <closure>],
   [feq -> <closure>] }
+Gas remaining: 4001486
diff --git a/tests/eval/good/gold/builtin1.scilexp.gold b/tests/eval/good/gold/builtin1.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int32 2)],
   [a -> (Int32 100)],
   [f -> <closure>] }
+Gas remaining: 4001738
diff --git a/tests/eval/good/gold/builtin2.scilexp.gold b/tests/eval/good/gold/builtin2.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Int64 2)],
   [b -> (Int64 44)],
   [a -> (Int64 42)] }
+Gas remaining: 4001738
diff --git a/tests/eval/good/gold/builtin3.scilexp.gold b/tests/eval/good/gold/builtin3.scilexp.gold
@@ -4,3 +4,4 @@
   [two -> (Int128 2)],
   [b -> (Int128 44)],
   [a -> (Int128 42)] }
+Gas remaining: 4001723
diff --git a/tests/eval/good/gold/builtin5.scilexp.gold b/tests/eval/good/gold/builtin5.scilexp.gold
@@ -2,3 +2,4 @@
 { [b -> (Int256 2)],
   [a -> (Int256 100)],
   [f -> <closure>] }
+Gas remaining: 4001714
diff --git a/tests/eval/good/gold/builtin6.scilexp.gold b/tests/eval/good/gold/builtin6.scilexp.gold
@@ -71,3 +71,4 @@
   [c -> (Int32 40)],
   [b -> (Int32 2)],
   [a -> (Int32 100)] }
+Gas remaining: 4000820
diff --git a/tests/eval/good/gold/cons.scilexp.gold b/tests/eval/good/gold/cons.scilexp.gold
@@ -4,3 +4,4 @@
   [msg -> (Message [(tag : (String "Main")) ; (value : (Int32 5))])],
   [one_msg -> <closure>],
   [nil_msg -> (Nil)] }
+Gas remaining: 4001745
diff --git a/tests/eval/good/gold/fib.scilexp.gold b/tests/eval/good/gold/fib.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Nat 2)],
   [one -> (Nat 1)],
   [zero -> (Nat 0)] }
+Gas remaining: 4001610
diff --git a/tests/eval/good/gold/func_pair.scilexp.gold b/tests/eval/good/gold/func_pair.scilexp.gold
@@ -3,3 +3,4 @@
   [s -> (String "abc")],
   [p -> (Pair <closure> <closure>)],
   [f -> <closure>] }
+Gas remaining: 4001705
diff --git a/tests/eval/good/gold/hash1.scilexp.gold b/tests/eval/good/gold/hash1.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001674
diff --git a/tests/eval/good/gold/hash2.scilexp.gold b/tests/eval/good/gold/hash2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int64 42)],
   [k2 -> (Int64 2)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/hash3.scilexp.gold b/tests/eval/good/gold/hash3.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int128 2)],
   [k1 -> (Int128 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/hash4.scilexp.gold b/tests/eval/good/gold/hash4.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/hash5.scilexp.gold b/tests/eval/good/gold/hash5.scilexp.gold
@@ -19,3 +19,4 @@
   [v3 -> (Int128 43)],
   [v2 -> (Int64 2)],
   [v1 -> (Int32 1)] }
+Gas remaining: 4001716
diff --git a/tests/eval/good/gold/hash_map_stable1.scilexp.gold b/tests/eval/good/gold/hash_map_stable1.scilexp.gold
@@ -10,3 +10,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001701
diff --git a/tests/eval/good/gold/hash_map_stable2.scilexp.gold b/tests/eval/good/gold/hash_map_stable2.scilexp.gold
@@ -10,3 +10,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001697
diff --git a/tests/eval/good/gold/hash_map_stable3.scilexp.gold b/tests/eval/good/gold/hash_map_stable3.scilexp.gold
@@ -9,3 +9,4 @@
   [k2 -> (Int64 2)],
   [v1 -> (Int64 48)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001702
diff --git a/tests/eval/good/gold/hof.scilexp.gold b/tests/eval/good/gold/hof.scilexp.gold
@@ -1,2 +1,3 @@
 <type_closure>,
 { [g -> <type_closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/hof2.scilexp.gold b/tests/eval/good/gold/hof2.scilexp.gold
@@ -1,2 +1,3 @@
 <closure>,
 { [g -> <closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/hof3.scilexp.gold b/tests/eval/good/gold/hof3.scilexp.gold
@@ -1,2 +1,3 @@
 <closure>,
 { [g -> <closure>] }
+Gas remaining: 4001754
diff --git a/tests/eval/good/gold/id.scilexp.gold b/tests/eval/good/gold/id.scilexp.gold
@@ -2,3 +2,4 @@
 { [n -> (Int32 42)],
   [id_int -> <closure>],
   [id -> <type_closure>] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/int_conversions.scilexp.gold b/tests/eval/good/gold/int_conversions.scilexp.gold
@@ -22,3 +22,4 @@
   [minus_one -> (Int32 -1)],
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)] }
+Gas remaining: 4001577
diff --git a/tests/eval/good/gold/int_to_nat.scilexp.gold b/tests/eval/good/gold/int_to_nat.scilexp.gold
@@ -17,3 +17,4 @@
   [zero_nat2 -> (Nat 0)],
   [zero_nat1 -> (Nat 0)],
   [zero_uint -> (Uint32 0)] }
+Gas remaining: 3001595
diff --git a/tests/eval/good/gold/keccak256_1.scilexp.gold b/tests/eval/good/gold/keccak256_1.scilexp.gold
@@ -6,3 +6,4 @@
   [v1 -> (Int32 42)],
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)] }
+Gas remaining: 4001741
diff --git a/tests/eval/good/gold/keccak256_2.scilexp.gold b/tests/eval/good/gold/keccak256_2.scilexp.gold
@@ -8,3 +8,4 @@
   [v1 -> (Int64 42)],
   [k2 -> (Int64 2)],
   [k1 -> (Int64 1)] }
+Gas remaining: 4001737
diff --git a/tests/eval/good/gold/keccak256_3.scilexp.gold b/tests/eval/good/gold/keccak256_3.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int128 2)],
   [k1 -> (Int128 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/keccak256_4.scilexp.gold b/tests/eval/good/gold/keccak256_4.scilexp.gold
@@ -14,3 +14,4 @@
   [k2 -> (Int32 2)],
   [k1 -> (Int32 1)],
   [hash_dist -> <closure>] }
+Gas remaining: 4001405
diff --git a/tests/eval/good/gold/keccak256_5.scilexp.gold b/tests/eval/good/gold/keccak256_5.scilexp.gold
@@ -19,3 +19,4 @@
   [v3 -> (Int128 43)],
   [v2 -> (Int64 2)],
   [v1 -> (Int32 1)] }
+Gas remaining: 4001716
diff --git a/tests/eval/good/gold/let-builtin.scilexp.gold b/tests/eval/good/gold/let-builtin.scilexp.gold
@@ -3,3 +3,4 @@
   [y -> (Int32 84)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001744
diff --git a/tests/eval/good/gold/let.scilexp.gold b/tests/eval/good/gold/let.scilexp.gold
@@ -3,3 +3,4 @@
   [y -> (Int32 42)],
   [f -> <closure>],
   [x -> (Int32 42)] }
+Gas remaining: 4001748
diff --git a/tests/eval/good/gold/let_in_let_in.scilexp.gold b/tests/eval/good/gold/let_in_let_in.scilexp.gold
@@ -1,2 +1,3 @@
 (Uint32 1),
 { [f -> (Uint32 1)] }
+Gas remaining: 4001752
diff --git a/tests/eval/good/gold/list_append.scilexp.gold b/tests/eval/good/gold/list_append.scilexp.gold
@@ -9,3 +9,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_append -> <closure>] }
+Gas remaining: 4001685
diff --git a/tests/eval/good/gold/list_eq.scilexp.gold b/tests/eval/good/gold/list_eq.scilexp.gold
@@ -21,3 +21,4 @@
   [two -> (Int64 2)],
   [one -> (Int64 1)],
   [int_list_eq -> <closure>] }
+Gas remaining: 4001295
diff --git a/tests/eval/good/gold/list_exists.scilexp.gold b/tests/eval/good/gold/list_exists.scilexp.gold
@@ -13,3 +13,4 @@
   [g -> <closure>],
   [f -> <closure>],
   [int_exists -> <closure>] }
+Gas remaining: 4001560
diff --git a/tests/eval/good/gold/list_filter.scilexp.gold b/tests/eval/good/gold/list_filter.scilexp.gold
@@ -10,3 +10,4 @@
   [one -> (Int32 1)],
   [f -> <closure>],
   [int_filter -> <closure>] }
+Gas remaining: 4001642
diff --git a/tests/eval/good/gold/list_find.scilexp.gold b/tests/eval/good/gold/list_find.scilexp.gold
@@ -13,3 +13,4 @@
   [one -> (Int64 1)],
   [f -> <closure>],
   [int_find -> <closure>] }
+Gas remaining: 4001598
diff --git a/tests/eval/good/gold/list_flatten.scilexp.gold b/tests/eval/good/gold/list_flatten.scilexp.gold
@@ -16,3 +16,4 @@
   [two -> (Int128 2)],
   [one -> (Int128 1)],
   [int_flatten -> <closure>] }
+Gas remaining: 4001604
diff --git a/tests/eval/good/gold/list_foldl.scilexp.gold b/tests/eval/good/gold/list_foldl.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001660
diff --git a/tests/eval/good/gold/list_foldl_while.scilexp.gold b/tests/eval/good/gold/list_foldl_while.scilexp.gold
@@ -11,3 +11,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001637
diff --git a/tests/eval/good/gold/list_foldr.scilexp.gold b/tests/eval/good/gold/list_foldr.scilexp.gold
@@ -8,3 +8,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [zero -> (Int32 0)] }
+Gas remaining: 4001660
diff --git a/tests/eval/good/gold/list_forall.scilexp.gold b/tests/eval/good/gold/list_forall.scilexp.gold
@@ -14,3 +14,4 @@
   [three -> (Int32 3)],
   [two -> (Int32 2)],
   [one -> (Int32 1)] }
+Gas remaining: 4001553
diff --git a/tests/eval/good/gold/list_head.scilexp.gold b/tests/eval/good/gold/list_head.scilexp.gold
@@ -7,3 +7,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_head -> <closure>] }
+Gas remaining: 4001736
diff --git a/tests/eval/good/gold/list_length.scilexp.gold b/tests/eval/good/gold/list_length.scilexp.gold
@@ -11,3 +11,4 @@
   [two -> (Int32 2)],
   [one -> (Int32 1)],
   [int_length -> <closure>] }
+Gas remaining: 4001649
diff --git a/tests/eval/good/gold/list_map.scilexp.gold b/tests/eval/good/gold/list_map.scilexp.gold
@@ -9,3 +9,4 @@
   [one -> (Uint32 1)],
   [f -> <closure>],
   [int_map -> <closure>] }
+Gas remaining: 4001587
diff --git a/tests/eval/good/gold/list_mem.scilexp.gold b/tests/eval/good/gold/list_mem.scilexp.gold
@@ -15,3 +15,4 @@
   [zero -> (Int32 0)],
   [f -> <closure>],
   [int_mem -> <closure>] }
+Gas remaining: 4001379
diff --git a/tests/eval/good/gold/list_nth.scilexp.gold b/tests/eval/good/gold/list_nth.scilexp.gold
@@ -15,3 +15,4 @@
   [one -> (Uint32 1)],
   [zero -> (Uint32 0)],
   [int_nth -> <closure>] }
+Gas remaining: 4001278