8 files changed, 2 insertions, 542 deletions
diff --git a/tests/lean/HashmapMain/TypesExternal.lean b/tests/lean/Hashmap/TypesExternal.lean
index 4e1cdbe9..b32c4c42 100644
--- a/tests/lean/HashmapMain/TypesExternal.lean
+++ b/tests/lean/Hashmap/TypesExternal.lean
@@ -1,4 +1,4 @@
--- [hashmap_main]: external types.
+-- [hashmap]: external types.
 import Base
 open Primitives
 
diff --git a/tests/lean/HashmapMain/TypesExternal_Template.lean b/tests/lean/Hashmap/TypesExternal_Template.lean
index cfa8bbb1..03c3d157 100644
--- a/tests/lean/HashmapMain/TypesExternal_Template.lean
+++ b/tests/lean/Hashmap/TypesExternal_Template.lean
@@ -1,5 +1,5 @@
 -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [hashmap_main]: external types.
+-- [hashmap]: external types.
 -- This is a template file: rename it to "TypesExternal.lean" and fill the holes.
 import Base
 open Primitives
diff --git a/tests/lean/HashmapMain.lean b/tests/lean/HashmapMain.lean
deleted file mode 100644
index 1a4e7f82..00000000
--- a/tests/lean/HashmapMain.lean
+++ /dev/null
@@ -1 +0,0 @@
-import HashmapMain.Funs
diff --git a/tests/lean/HashmapMain/Funs.lean b/tests/lean/HashmapMain/Funs.lean
deleted file mode 100644
index 45d6b058..00000000
--- a/tests/lean/HashmapMain/Funs.lean
+++ /dev/null
@@ -1,463 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [hashmap_main]: function definitions
-import Base
-import HashmapMain.Types
-import HashmapMain.FunsExternal
-open Primitives
-
-namespace hashmap_main
-
-/- [hashmap_main::hashmap::hash_key]:
-   Source: 'tests/src/hashmap.rs', lines 35:0-35:32 -/
-def hashmap.hash_key (k : Usize) : Result Usize :=
-  Result.ok k
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 58:4-64:5 -/
-divergent def hashmap.HashMap.allocate_slots_loop
-  (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) :
-  Result (alloc.vec.Vec (hashmap.List T))
-  :=
-  if n > 0#usize
-  then
-    do
-    let slots1 ← alloc.vec.Vec.push (hashmap.List T) slots hashmap.List.Nil
-    let n1 ← n - 1#usize
-    hashmap.HashMap.allocate_slots_loop T slots1 n1
-  else Result.ok slots
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]:
-   Source: 'tests/src/hashmap.rs', lines 58:4-58:76 -/
-def hashmap.HashMap.allocate_slots
-  (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) :
-  Result (alloc.vec.Vec (hashmap.List T))
-  :=
-  hashmap.HashMap.allocate_slots_loop T slots n
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]:
-   Source: 'tests/src/hashmap.rs', lines 67:4-71:13 -/
-def hashmap.HashMap.new_with_capacity
-  (T : Type) (capacity : Usize) (max_load_dividend : Usize)
-  (max_load_divisor : Usize) :
-  Result (hashmap.HashMap T)
-  :=
-  do
-  let slots ←
-    hashmap.HashMap.allocate_slots T (alloc.vec.Vec.new (hashmap.List T))
-      capacity
-  let i ← capacity * max_load_dividend
-  let i1 ← i / max_load_divisor
-  Result.ok
-    {
-      num_entries := 0#usize,
-      max_load_factor := (max_load_dividend, max_load_divisor),
-      max_load := i1,
-      slots := slots
-    }
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]:
-   Source: 'tests/src/hashmap.rs', lines 83:4-83:24 -/
-def hashmap.HashMap.new (T : Type) : Result (hashmap.HashMap T) :=
-  hashmap.HashMap.new_with_capacity T 32#usize 4#usize 5#usize
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 88:4-96:5 -/
-divergent def hashmap.HashMap.clear_loop
-  (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
-  Result (alloc.vec.Vec (hashmap.List T))
-  :=
-  let i1 := alloc.vec.Vec.len (hashmap.List T) slots
-  if i < i1
-  then
-    do
-    let (_, index_mut_back) ←
-      alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i
-    let i2 ← i + 1#usize
-    let slots1 ← index_mut_back hashmap.List.Nil
-    hashmap.HashMap.clear_loop T slots1 i2
-  else Result.ok slots
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]:
-   Source: 'tests/src/hashmap.rs', lines 88:4-88:27 -/
-def hashmap.HashMap.clear
-  (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
-  do
-  let hm ← hashmap.HashMap.clear_loop T self.slots 0#usize
-  Result.ok { self with num_entries := 0#usize, slots := hm }
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]:
-   Source: 'tests/src/hashmap.rs', lines 98:4-98:30 -/
-def hashmap.HashMap.len (T : Type) (self : hashmap.HashMap T) : Result Usize :=
-  Result.ok self.num_entries
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 105:4-122:5 -/
-divergent def hashmap.HashMap.insert_in_list_loop
-  (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) :
-  Result (Bool × (hashmap.List T))
-  :=
-  match ls with
-  | hashmap.List.Cons ckey cvalue tl =>
-    if ckey = key
-    then Result.ok (false, hashmap.List.Cons ckey value tl)
-    else
-      do
-      let (b, tl1) ← hashmap.HashMap.insert_in_list_loop T key value tl
-      Result.ok (b, hashmap.List.Cons ckey cvalue tl1)
-  | hashmap.List.Nil =>
-    Result.ok (true, hashmap.List.Cons key value hashmap.List.Nil)
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 105:4-105:71 -/
-def hashmap.HashMap.insert_in_list
-  (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) :
-  Result (Bool × (hashmap.List T))
-  :=
-  hashmap.HashMap.insert_in_list_loop T key value ls
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]:
-   Source: 'tests/src/hashmap.rs', lines 125:4-125:54 -/
-def hashmap.HashMap.insert_no_resize
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) :
-  Result (hashmap.HashMap T)
-  :=
-  do
-  let hash ← hashmap.hash_key key
-  let i := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (hashmap.List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots
-      hash_mod
-  let (inserted, l1) ← hashmap.HashMap.insert_in_list T key value l
-  if inserted
-  then
-    do
-    let i1 ← self.num_entries + 1#usize
-    let v ← index_mut_back l1
-    Result.ok { self with num_entries := i1, slots := v }
-  else do
-       let v ← index_mut_back l1
-       Result.ok { self with slots := v }
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 191:4-204:5 -/
-divergent def hashmap.HashMap.move_elements_from_list_loop
-  (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) :
-  Result (hashmap.HashMap T)
-  :=
-  match ls with
-  | hashmap.List.Cons k v tl =>
-    do
-    let ntable1 ← hashmap.HashMap.insert_no_resize T ntable k v
-    hashmap.HashMap.move_elements_from_list_loop T ntable1 tl
-  | hashmap.List.Nil => Result.ok ntable
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]:
-   Source: 'tests/src/hashmap.rs', lines 191:4-191:72 -/
-def hashmap.HashMap.move_elements_from_list
-  (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) :
-  Result (hashmap.HashMap T)
-  :=
-  hashmap.HashMap.move_elements_from_list_loop T ntable ls
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 179:4-188:5 -/
-divergent def hashmap.HashMap.move_elements_loop
-  (T : Type) (ntable : hashmap.HashMap T)
-  (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
-  Result ((hashmap.HashMap T) × (alloc.vec.Vec (hashmap.List T)))
-  :=
-  let i1 := alloc.vec.Vec.len (hashmap.List T) slots
-  if i < i1
-  then
-    do
-    let (l, index_mut_back) ←
-      alloc.vec.Vec.index_mut (hashmap.List T) Usize
-        (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i
-    let (ls, l1) := core.mem.replace (hashmap.List T) l hashmap.List.Nil
-    let ntable1 ← hashmap.HashMap.move_elements_from_list T ntable ls
-    let i2 ← i + 1#usize
-    let slots1 ← index_mut_back l1
-    hashmap.HashMap.move_elements_loop T ntable1 slots1 i2
-  else Result.ok (ntable, slots)
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]:
-   Source: 'tests/src/hashmap.rs', lines 179:4-179:95 -/
-def hashmap.HashMap.move_elements
-  (T : Type) (ntable : hashmap.HashMap T)
-  (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) :
-  Result ((hashmap.HashMap T) × (alloc.vec.Vec (hashmap.List T)))
-  :=
-  hashmap.HashMap.move_elements_loop T ntable slots i
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]:
-   Source: 'tests/src/hashmap.rs', lines 148:4-148:28 -/
-def hashmap.HashMap.try_resize
-  (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
-  do
-  let max_usize ← Scalar.cast .Usize core_u32_max
-  let capacity := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let n1 ← max_usize / 2#usize
-  let (i, i1) := self.max_load_factor
-  let i2 ← n1 / i
-  if capacity <= i2
-  then
-    do
-    let i3 ← capacity * 2#usize
-    let ntable ← hashmap.HashMap.new_with_capacity T i3 i i1
-    let p ← hashmap.HashMap.move_elements T ntable self.slots 0#usize
-    let (ntable1, _) := p
-    Result.ok
-      {
-        ntable1
-          with
-          num_entries := self.num_entries, max_load_factor := (i, i1)
-      }
-  else Result.ok { self with max_load_factor := (i, i1) }
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]:
-   Source: 'tests/src/hashmap.rs', lines 137:4-137:48 -/
-def hashmap.HashMap.insert
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) :
-  Result (hashmap.HashMap T)
-  :=
-  do
-  let self1 ← hashmap.HashMap.insert_no_resize T self key value
-  let i ← hashmap.HashMap.len T self1
-  if i > self1.max_load
-  then hashmap.HashMap.try_resize T self1
-  else Result.ok self1
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 214:4-227:5 -/
-divergent def hashmap.HashMap.contains_key_in_list_loop
-  (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool :=
-  match ls with
-  | hashmap.List.Cons ckey _ tl =>
-    if ckey = key
-    then Result.ok true
-    else hashmap.HashMap.contains_key_in_list_loop T key tl
-  | hashmap.List.Nil => Result.ok false
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 214:4-214:68 -/
-def hashmap.HashMap.contains_key_in_list
-  (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool :=
-  hashmap.HashMap.contains_key_in_list_loop T key ls
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]:
-   Source: 'tests/src/hashmap.rs', lines 207:4-207:49 -/
-def hashmap.HashMap.contains_key
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result Bool :=
-  do
-  let hash ← hashmap.hash_key key
-  let i := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let hash_mod ← hash % i
-  let l ←
-    alloc.vec.Vec.index (hashmap.List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots
-      hash_mod
-  hashmap.HashMap.contains_key_in_list T key l
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 232:4-245:5 -/
-divergent def hashmap.HashMap.get_in_list_loop
-  (T : Type) (key : Usize) (ls : hashmap.List T) : Result T :=
-  match ls with
-  | hashmap.List.Cons ckey cvalue tl =>
-    if ckey = key
-    then Result.ok cvalue
-    else hashmap.HashMap.get_in_list_loop T key tl
-  | hashmap.List.Nil => Result.fail .panic
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 232:4-232:70 -/
-def hashmap.HashMap.get_in_list
-  (T : Type) (key : Usize) (ls : hashmap.List T) : Result T :=
-  hashmap.HashMap.get_in_list_loop T key ls
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]:
-   Source: 'tests/src/hashmap.rs', lines 247:4-247:55 -/
-def hashmap.HashMap.get
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T :=
-  do
-  let hash ← hashmap.hash_key key
-  let i := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let hash_mod ← hash % i
-  let l ←
-    alloc.vec.Vec.index (hashmap.List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots
-      hash_mod
-  hashmap.HashMap.get_in_list T key l
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 253:4-262:5 -/
-divergent def hashmap.HashMap.get_mut_in_list_loop
-  (T : Type) (ls : hashmap.List T) (key : Usize) :
-  Result (T × (T → Result (hashmap.List T)))
-  :=
-  match ls with
-  | hashmap.List.Cons ckey cvalue tl =>
-    if ckey = key
-    then
-      let back := fun ret => Result.ok (hashmap.List.Cons ckey ret tl)
-      Result.ok (cvalue, back)
-    else
-      do
-      let (t, back) ← hashmap.HashMap.get_mut_in_list_loop T tl key
-      let back1 :=
-        fun ret =>
-          do
-          let tl1 ← back ret
-          Result.ok (hashmap.List.Cons ckey cvalue tl1)
-      Result.ok (t, back1)
-  | hashmap.List.Nil => Result.fail .panic
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]:
-   Source: 'tests/src/hashmap.rs', lines 253:4-253:86 -/
-def hashmap.HashMap.get_mut_in_list
-  (T : Type) (ls : hashmap.List T) (key : Usize) :
-  Result (T × (T → Result (hashmap.List T)))
-  :=
-  hashmap.HashMap.get_mut_in_list_loop T ls key
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]:
-   Source: 'tests/src/hashmap.rs', lines 265:4-265:67 -/
-def hashmap.HashMap.get_mut
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) :
-  Result (T × (T → Result (hashmap.HashMap T)))
-  :=
-  do
-  let hash ← hashmap.hash_key key
-  let i := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (hashmap.List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots
-      hash_mod
-  let (t, get_mut_in_list_back) ← hashmap.HashMap.get_mut_in_list T l key
-  let back :=
-    fun ret =>
-      do
-      let l1 ← get_mut_in_list_back ret
-      let v ← index_mut_back l1
-      Result.ok { self with slots := v }
-  Result.ok (t, back)
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0:
-   Source: 'tests/src/hashmap.rs', lines 273:4-299:5 -/
-divergent def hashmap.HashMap.remove_from_list_loop
-  (T : Type) (key : Usize) (ls : hashmap.List T) :
-  Result ((Option T) × (hashmap.List T))
-  :=
-  match ls with
-  | hashmap.List.Cons ckey t tl =>
-    if ckey = key
-    then
-      let (mv_ls, _) :=
-        core.mem.replace (hashmap.List T) (hashmap.List.Cons ckey t tl)
-          hashmap.List.Nil
-      match mv_ls with
-      | hashmap.List.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1)
-      | hashmap.List.Nil => Result.fail .panic
-    else
-      do
-      let (o, tl1) ← hashmap.HashMap.remove_from_list_loop T key tl
-      Result.ok (o, hashmap.List.Cons ckey t tl1)
-  | hashmap.List.Nil => Result.ok (none, hashmap.List.Nil)
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]:
-   Source: 'tests/src/hashmap.rs', lines 273:4-273:69 -/
-def hashmap.HashMap.remove_from_list
-  (T : Type) (key : Usize) (ls : hashmap.List T) :
-  Result ((Option T) × (hashmap.List T))
-  :=
-  hashmap.HashMap.remove_from_list_loop T key ls
-
-/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]:
-   Source: 'tests/src/hashmap.rs', lines 302:4-302:52 -/
-def hashmap.HashMap.remove
-  (T : Type) (self : hashmap.HashMap T) (key : Usize) :
-  Result ((Option T) × (hashmap.HashMap T))
-  :=
-  do
-  let hash ← hashmap.hash_key key
-  let i := alloc.vec.Vec.len (hashmap.List T) self.slots
-  let hash_mod ← hash % i
-  let (l, index_mut_back) ←
-    alloc.vec.Vec.index_mut (hashmap.List T) Usize
-      (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots
-      hash_mod
-  let (x, l1) ← hashmap.HashMap.remove_from_list T key l
-  match x with
-  | none =>
-    do
-    let v ← index_mut_back l1
-    Result.ok (none, { self with slots := v })
-  | some x1 =>
-    do
-    let i1 ← self.num_entries - 1#usize
-    let v ← index_mut_back l1
-    Result.ok (some x1, { self with num_entries := i1, slots := v })
-
-/- [hashmap_main::hashmap::test1]:
-   Source: 'tests/src/hashmap.rs', lines 323:0-323:10 -/
-def hashmap.test1 : Result Unit :=
-  do
-  let hm ← hashmap.HashMap.new U64
-  let hm1 ← hashmap.HashMap.insert U64 hm 0#usize 42#u64
-  let hm2 ← hashmap.HashMap.insert U64 hm1 128#usize 18#u64
-  let hm3 ← hashmap.HashMap.insert U64 hm2 1024#usize 138#u64
-  let hm4 ← hashmap.HashMap.insert U64 hm3 1056#usize 256#u64
-  let i ← hashmap.HashMap.get U64 hm4 128#usize
-  if ¬ (i = 18#u64)
-  then Result.fail .panic
-  else
-    do
-    let (_, get_mut_back) ← hashmap.HashMap.get_mut U64 hm4 1024#usize
-    let hm5 ← get_mut_back 56#u64
-    let i1 ← hashmap.HashMap.get U64 hm5 1024#usize
-    if ¬ (i1 = 56#u64)
-    then Result.fail .panic
-    else
-      do
-      let (x, hm6) ← hashmap.HashMap.remove U64 hm5 1024#usize
-      match x with
-      | none => Result.fail .panic
-      | some x1 =>
-        if ¬ (x1 = 56#u64)
-        then Result.fail .panic
-        else
-          do
-          let i2 ← hashmap.HashMap.get U64 hm6 0#usize
-          if ¬ (i2 = 42#u64)
-          then Result.fail .panic
-          else
-            do
-            let i3 ← hashmap.HashMap.get U64 hm6 128#usize
-            if ¬ (i3 = 18#u64)
-            then Result.fail .panic
-            else
-              do
-              let i4 ← hashmap.HashMap.get U64 hm6 1056#usize
-              if ¬ (i4 = 256#u64)
-              then Result.fail .panic
-              else Result.ok ()
-
-/- [hashmap_main::insert_on_disk]:
-   Source: 'tests/src/hashmap_main.rs', lines 13:0-13:43 -/
-def insert_on_disk
-  (key : Usize) (value : U64) (st : State) : Result (State × Unit) :=
-  do
-  let (st1, hm) ← hashmap_utils.deserialize st
-  let hm1 ← hashmap.HashMap.insert U64 hm key value
-  hashmap_utils.serialize hm1 st1
-
-/- [hashmap_main::main]:
-   Source: 'tests/src/hashmap_main.rs', lines 22:0-22:13 -/
-def main : Result Unit :=
-  Result.ok ()
-
-end hashmap_main
diff --git a/tests/lean/HashmapMain/FunsExternal.lean b/tests/lean/HashmapMain/FunsExternal.lean
deleted file mode 100644
index b394b32b..00000000
--- a/tests/lean/HashmapMain/FunsExternal.lean
+++ /dev/null
@@ -1,17 +0,0 @@
--- [hashmap_main]: templates for the external functions.
-import Base
-import HashmapMain.Types
-open Primitives
-open hashmap_main
-
--- TODO: fill those bodies
-
-/- [hashmap_main::hashmap_utils::deserialize] -/
-def hashmap_utils.deserialize
-  : State → Result (State × (hashmap.HashMap U64)) :=
-  fun _ => .fail .panic
-
-/- [hashmap_main::hashmap_utils::serialize] -/
-def hashmap_utils.serialize
-  : hashmap.HashMap U64 → State → Result (State × Unit) :=
-  fun _ _ => .fail .panic
diff --git a/tests/lean/HashmapMain/FunsExternal_Template.lean b/tests/lean/HashmapMain/FunsExternal_Template.lean
deleted file mode 100644
index 1a6c40d5..00000000
--- a/tests/lean/HashmapMain/FunsExternal_Template.lean
+++ /dev/null
@@ -1,18 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [hashmap_main]: external functions.
--- This is a template file: rename it to "FunsExternal.lean" and fill the holes.
-import Base
-import HashmapMain.Types
-open Primitives
-open hashmap_main
-
-/- [hashmap_main::hashmap_utils::deserialize]:
-   Source: 'tests/src/hashmap_utils.rs', lines 11:0-11:43 -/
-axiom hashmap_utils.deserialize
-  : State → Result (State × (hashmap.HashMap U64))
-
-/- [hashmap_main::hashmap_utils::serialize]:
-   Source: 'tests/src/hashmap_utils.rs', lines 6:0-6:42 -/
-axiom hashmap_utils.serialize
-  : hashmap.HashMap U64 → State → Result (State × Unit)
-
diff --git a/tests/lean/HashmapMain/Opaque.lean b/tests/lean/HashmapMain/Opaque.lean
deleted file mode 100644
index a410b253..00000000
--- a/tests/lean/HashmapMain/Opaque.lean
+++ /dev/null
@@ -1,18 +0,0 @@
--- [hashmap_main]: opaque function definitions
-import Base
-import HashmapMain.Types
-open Primitives
-
-namespace hashmap_main
-
-structure OpaqueDefs where
-  
-  /- [hashmap_main::hashmap_utils::deserialize] -/
-  hashmap_utils.deserialize_fwd
-    : State → Result (State × (hashmap_hash_map_t U64))
-  
-  /- [hashmap_main::hashmap_utils::serialize] -/
-  hashmap_utils.serialize_fwd
-    : hashmap_hash_map_t U64 → State → Result (State × Unit)
-  
-end hashmap_main
diff --git a/tests/lean/HashmapMain/Types.lean b/tests/lean/HashmapMain/Types.lean
deleted file mode 100644
index 54f11e1e..00000000
--- a/tests/lean/HashmapMain/Types.lean
+++ /dev/null
@@ -1,23 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [hashmap_main]: type definitions
-import Base
-import HashmapMain.TypesExternal
-open Primitives
-
-namespace hashmap_main
-
-/- [hashmap_main::hashmap::List]
-   Source: 'tests/src/hashmap.rs', lines 27:0-27:16 -/
-inductive hashmap.List (T : Type) :=
-| Cons : Usize → T → hashmap.List T → hashmap.List T
-| Nil : hashmap.List T
-
-/- [hashmap_main::hashmap::HashMap]
-   Source: 'tests/src/hashmap.rs', lines 43:0-43:21 -/
-structure hashmap.HashMap (T : Type) where
-  num_entries : Usize
-  max_load_factor : (Usize × Usize)
-  max_load : Usize
-  slots : alloc.vec.Vec (hashmap.List T)
-
-end hashmap_main