Update test cases in Cairo, fix typos

Author: guo-yu

README.md

@@ -39,15 +39,15 @@ from codefordao.utils.array import Array
 Array.save(
   arr_len: felt,
   arr: felt*
-) -> (key: ArrayInfo.key)
+) -> (key: felt)
 
 Array.get_item(
-  key: ArrayInfo.key,
+  key: felt,
   index: felt
 ) -> (res: felt)
 
 Array.get_array(
-  key: ArrayInfo.key,
+  key: felt,
 ) -> (
   arr_len: felt,
   arr: felt*

pytest.ini

@@ -1,5 +1,3 @@
 wheel
 cairo-lang
-cairo-nile
-pytest-cairo
-tox
+cairo-nile

requirements.txt

@@ -1,7 +1,7 @@
 [metadata]
 name = cairo-array-utils
 version = attr: cairo-array-utils.__version__
-description = Array helpers in Cairo.
+description = a set of useful functions utils for manipulating arrays in Cairo lang
 author = GUO Yu
 author_email = [email protected]
 license = MIT
@@ -13,6 +13,7 @@ classifiers =
     Operating System :: OS Independent
 
 [options]
+python_requires = >=3.7
 zip_safe = False
 packages = find_namespace:
 include_package_data = True
@@ -28,10 +29,4 @@ exclude =
     tests
 
 [options.package_data]
-codefordao = "*.cairo"
-
-[options.extras_require]
-testing =
-    setuptools
-    tox
-    pytest
+codefordao = "*.cairo"

setup.cfg

@@ -6,6 +6,6 @@
     import importlib_metadata
 
 try:
-    __version__ = importlib_metadata.version("checksfinance-soulmoment")
+    __version__ = importlib_metadata.version("cairo-array-utils")
 except importlib_metadata.PackageNotFoundError:
     __version__ = None

src/codefordao/__init__.py

@@ -19,7 +19,7 @@ func _arrays(key: felt, index: felt) -> (res: felt):
 end
 
 @storage_var
-func _array_info(key: felt) -> (slot: ArrayInfo):
+func _array_info(key: felt) -> (res: ArrayInfo):
 end
 
 namespace Array:
@@ -32,14 +32,16 @@ namespace Array:
             arr_len: felt, 
             arr: felt*
         ) -> (key: felt):
+        alloc_locals
+
         with_attr error_message("Arrays.push: invalid length of giving array"):
             assert arr_len = 0
         end
 
-        let (k) = _array_key_index.read()
+        let (local k) = _array_key_index.read()
         let info = ArrayInfo(key=k, len=arr_len)
 
-        _array_info.write(key=k, slot=info)
+        _array_info.write(key=k, value=info)
         _write_array(key=k, arr_index=0, arr_len=arr_len, arr=arr)
         _array_key_index.write(k + 1)
 
@@ -68,16 +70,16 @@ namespace Array:
             arr: felt*
         ):
         alloc_locals
+
         let (arr) = alloc()
-        let (arr_info) = _array_info.read(key)
-        let (arr_len) = arr_info.len
+        let (local arr_info) = _array_info.read(key)
 
-        if arr_len == 0:
-            return (arr_len=arr_len, arr=arr)
+        if arr_info.len == 0:
+            return (arr_len=arr_info.len, arr=arr)
         end
 
-        _read_array(key=key, arr_index=0, arr_len=arr_len, arr=arr)
-        return (arr_len=arr_len, arr=arr) 
+        _read_array(key=key, arr_index=0, arr_len=arr_info.len, arr=arr)
+        return (arr_len=arr_info.len, arr=arr) 
     end
 
     # Store arrays into multi-dimensional maps by recursion

src/codefordao/utils/array.cairo

@@ -0,0 +1,27 @@
+%lang starknet
+
+from starkware.cairo.common.cairo_builtins import HashBuiltin
+from starkware.cairo.common.alloc import alloc
+from src.codefordao.utils.array import Array
+
+@view
+func test_array_utils{syscall_ptr : felt*, pedersen_ptr : HashBuiltin*, range_check_ptr}():
+    alloc_locals
+
+    let (local array : felt*) = alloc()
+    assert array[0] = 1
+    assert array[1] = 2
+    assert array[2] = 3
+    assert array[3] = 4
+
+    let (arr_key) = Array.save(4, array)
+    let (local arr_len: felt, local arr : felt*) = Array.get_array(arr_key)
+
+    assert 1 = arr[0]
+    assert 2 = arr[1]
+    assert 3 = arr[2]
+    assert 4 = arr[3]
+    assert 4 = arr_len
+
+    return ()
+end