Change get_global_value to return {:ok, result}

tessi · Apr 3, 2024 · fbc8b06 · fbc8b06
1 parent 3923979
commit fbc8b06
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/lib/wasmex/instance.ex b/lib/wasmex/instance.ex
@@ -187,6 +187,10 @@ defmodule Wasmex.Instance do
       instance_resource,
       global_name
     )
+    |> case do
+      {:error, _reason} = term -> term
+      result when is_number(result) -> {:ok, result}
+    end
   end
 
   @doc ~S"""

diff --git a/test/wasmex/instance_test.exs b/test/wasmex/instance_test.exs
@@ -212,9 +212,9 @@ defmodule Wasmex.InstanceTest do
       assert {:error, "exported global `unknown_global` not found"} =
                Wasmex.Instance.get_global_value(store, instance, "unknown_global")
 
-      assert 42 = Wasmex.Instance.get_global_value(store, instance, "meaning_of_life")
-      assert -32 = Wasmex.Instance.get_global_value(store, instance, "count_32")
-      assert -64 = Wasmex.Instance.get_global_value(store, instance, "count_64")
+      assert {:ok, 42} = Wasmex.Instance.get_global_value(store, instance, "meaning_of_life")
+      assert {:ok, -32} = Wasmex.Instance.get_global_value(store, instance, "count_32")
+      assert {:ok, -64} = Wasmex.Instance.get_global_value(store, instance, "count_64")
     end
 
     test t(&Wasmex.Instance.set_global_value/4), context do
@@ -228,16 +228,22 @@ defmodule Wasmex.InstanceTest do
                Wasmex.Instance.set_global_value(store, instance, "meaning_of_life", 0)
 
       assert :ok = Wasmex.Instance.set_global_value(store, instance, "count_32", 99)
-      assert 99 = Wasmex.Instance.get_global_value(store, instance, "count_32")
+      assert {:ok, 99} = Wasmex.Instance.get_global_value(store, instance, "count_32")
 
       assert :ok = Wasmex.Instance.set_global_value(store, instance, "count_64", 17)
-      assert 17 = Wasmex.Instance.get_global_value(store, instance, "count_64")
+      assert {:ok, 17} = Wasmex.Instance.get_global_value(store, instance, "count_64")
 
       assert :ok = Wasmex.Instance.set_global_value(store, instance, "bad_pi_32", 3.14)
-      assert_in_delta 3.14, Wasmex.Instance.get_global_value(store, instance, "bad_pi_32"), 0.01
+
+      assert_in_delta 3.14,
+                      elem(Wasmex.Instance.get_global_value(store, instance, "bad_pi_32"), 1),
+                      0.01
 
       assert :ok = Wasmex.Instance.set_global_value(store, instance, "bad_pi_64", 3.14)
-      assert_in_delta 3.14, Wasmex.Instance.get_global_value(store, instance, "bad_pi_64"), 0.01
+
+      assert_in_delta 3.14,
+                      elem(Wasmex.Instance.get_global_value(store, instance, "bad_pi_64"), 1),
+                      0.01
     end
   end
 end