From fa6dcd3ebbdc7a508157ff2a12f91e70d2012a86 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Tue, 15 Nov 2022 15:25:47 +0100
Subject: Change the name of the generated Coq modules

---
 tests/coq/hashmap_on_disk/HashmapMain_Funs.v    | 598 ++++++++++++++++++++++++
 tests/coq/hashmap_on_disk/HashmapMain_Opaque.v  |  21 +
 tests/coq/hashmap_on_disk/HashmapMain_Types.v   |  41 ++
 tests/coq/hashmap_on_disk/HashmapMain__Funs.v   | 598 ------------------------
 tests/coq/hashmap_on_disk/HashmapMain__Opaque.v |  21 -
 tests/coq/hashmap_on_disk/HashmapMain__Types.v  |  41 --
 6 files changed, 660 insertions(+), 660 deletions(-)
 create mode 100644 tests/coq/hashmap_on_disk/HashmapMain_Funs.v
 create mode 100644 tests/coq/hashmap_on_disk/HashmapMain_Opaque.v
 create mode 100644 tests/coq/hashmap_on_disk/HashmapMain_Types.v
 delete mode 100644 tests/coq/hashmap_on_disk/HashmapMain__Funs.v
 delete mode 100644 tests/coq/hashmap_on_disk/HashmapMain__Opaque.v
 delete mode 100644 tests/coq/hashmap_on_disk/HashmapMain__Types.v

(limited to 'tests/coq/hashmap_on_disk')

diff --git a/tests/coq/hashmap_on_disk/HashmapMain_Funs.v b/tests/coq/hashmap_on_disk/HashmapMain_Funs.v
new file mode 100644
index 00000000..b4351dc3
--- /dev/null
+++ b/tests/coq/hashmap_on_disk/HashmapMain_Funs.v
@@ -0,0 +1,598 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [hashmap_main]: function definitions *)
+Require Import Primitives.
+Import Primitives.
+Require Import Coq.ZArith.ZArith.
+Local Open Scope Primitives_scope.
+Require Export HashmapMain_Types.
+Import HashmapMain_Types.
+Require Export HashmapMain_Opaque.
+Import HashmapMain_Opaque.
+Module HashmapMain_Funs.
+
+(** [hashmap_main::hashmap::hash_key] *)
+Definition hashmap_hash_key_fwd (k : usize) : result usize := Return k.
+
+(** [hashmap_main::hashmap::HashMap::{0}::allocate_slots] *)
+Fixpoint hashmap_hash_map_allocate_slots_fwd
+  (T : Type) (n : nat) (slots : vec (Hashmap_list_t T)) (n0 : usize) :
+  result (vec (Hashmap_list_t T))
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n1 =>
+    if n0 s= 0%usize
+    then Return slots
+    else (
+      slots0 <- vec_push_back (Hashmap_list_t T) slots HashmapListNil;
+      i <- usize_sub n0 1%usize;
+      v <- hashmap_hash_map_allocate_slots_fwd T n1 slots0 i;
+      Return v)
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::new_with_capacity] *)
+Definition hashmap_hash_map_new_with_capacity_fwd
+  (T : Type) (n : nat) (capacity : usize) (max_load_dividend : usize)
+  (max_load_divisor : usize) :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    let v := vec_new (Hashmap_list_t T) in
+    slots <- hashmap_hash_map_allocate_slots_fwd T n0 v capacity;
+    i <- usize_mul capacity max_load_dividend;
+    i0 <- usize_div i max_load_divisor;
+    Return (mkHashmap_hash_map_t (0%usize) (max_load_dividend,
+      max_load_divisor) i0 slots)
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::new] *)
+Definition hashmap_hash_map_new_fwd
+  (T : Type) (n : nat) : result (Hashmap_hash_map_t T) :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hm <-
+      hashmap_hash_map_new_with_capacity_fwd T n0 (32%usize) (4%usize)
+        (5%usize);
+    Return hm
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::clear_slots] *)
+Fixpoint hashmap_hash_map_clear_slots_fwd_back
+  (T : Type) (n : nat) (slots : vec (Hashmap_list_t T)) (i : usize) :
+  result (vec (Hashmap_list_t T))
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    let i0 := vec_len (Hashmap_list_t T) slots in
+    if i s< i0
+    then (
+      slots0 <- vec_index_mut_back (Hashmap_list_t T) slots i HashmapListNil;
+      i1 <- usize_add i 1%usize;
+      slots1 <- hashmap_hash_map_clear_slots_fwd_back T n0 slots0 i1;
+      Return slots1)
+    else Return slots
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::clear] *)
+Definition hashmap_hash_map_clear_fwd_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      v0 <- hashmap_hash_map_clear_slots_fwd_back T n0 v (0%usize);
+      Return (mkHashmap_hash_map_t (0%usize) p i0 v0)
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::len] *)
+Definition hashmap_hash_map_len_fwd
+  (T : Type) (self : Hashmap_hash_map_t T) : result usize :=
+  match self with | mkHashmap_hash_map_t i p i0 v => Return i end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::insert_in_list] *)
+Fixpoint hashmap_hash_map_insert_in_list_fwd
+  (T : Type) (n : nat) (key : usize) (value : T) (ls : Hashmap_list_t T) :
+  result bool
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey cvalue ls0 =>
+      if ckey s= key
+      then Return false
+      else (
+        b <- hashmap_hash_map_insert_in_list_fwd T n0 key value ls0; Return b)
+    | HashmapListNil => Return true
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::insert_in_list] *)
+Fixpoint hashmap_hash_map_insert_in_list_back
+  (T : Type) (n : nat) (key : usize) (value : T) (ls : Hashmap_list_t T) :
+  result (Hashmap_list_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey cvalue ls0 =>
+      if ckey s= key
+      then Return (HashmapListCons ckey value ls0)
+      else (
+        ls1 <- hashmap_hash_map_insert_in_list_back T n0 key value ls0;
+        Return (HashmapListCons ckey cvalue ls1))
+    | HashmapListNil =>
+      let l := HashmapListNil in Return (HashmapListCons key value l)
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::insert_no_resize] *)
+Definition hashmap_hash_map_insert_no_resize_fwd_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (value : T)
+  :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
+      inserted <- hashmap_hash_map_insert_in_list_fwd T n0 key value l;
+      if inserted
+      then (
+        i2 <- usize_add i 1%usize;
+        l0 <- hashmap_hash_map_insert_in_list_back T n0 key value l;
+        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
+        Return (mkHashmap_hash_map_t i2 p i0 v0))
+      else (
+        l0 <- hashmap_hash_map_insert_in_list_back T n0 key value l;
+        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
+        Return (mkHashmap_hash_map_t i p i0 v0))
+    end
+  end
+.
+
+(** [core::num::u32::{9}::MAX] *)
+Definition core_num_u32_max_body : result u32 := Return (4294967295%u32).
+Definition core_num_u32_max_c : u32 := core_num_u32_max_body%global.
+
+(** [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list] *)
+Fixpoint hashmap_hash_map_move_elements_from_list_fwd_back
+  (T : Type) (n : nat) (ntable : Hashmap_hash_map_t T) (ls : Hashmap_list_t T)
+  :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons k v tl =>
+      ntable0 <- hashmap_hash_map_insert_no_resize_fwd_back T n0 ntable k v;
+      ntable1 <-
+        hashmap_hash_map_move_elements_from_list_fwd_back T n0 ntable0 tl;
+      Return ntable1
+    | HashmapListNil => Return ntable
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::move_elements] *)
+Fixpoint hashmap_hash_map_move_elements_fwd_back
+  (T : Type) (n : nat) (ntable : Hashmap_hash_map_t T)
+  (slots : vec (Hashmap_list_t T)) (i : usize) :
+  result ((Hashmap_hash_map_t T) * (vec (Hashmap_list_t T)))
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    let i0 := vec_len (Hashmap_list_t T) slots in
+    if i s< i0
+    then (
+      l <- vec_index_mut_fwd (Hashmap_list_t T) slots i;
+      let ls := mem_replace_fwd (Hashmap_list_t T) l HashmapListNil in
+      ntable0 <-
+        hashmap_hash_map_move_elements_from_list_fwd_back T n0 ntable ls;
+      let l0 := mem_replace_back (Hashmap_list_t T) l HashmapListNil in
+      slots0 <- vec_index_mut_back (Hashmap_list_t T) slots i l0;
+      i1 <- usize_add i 1%usize;
+      p <- hashmap_hash_map_move_elements_fwd_back T n0 ntable0 slots0 i1;
+      let (ntable1, slots1) := p in
+      Return (ntable1, slots1))
+    else Return (ntable, slots)
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::try_resize] *)
+Definition hashmap_hash_map_try_resize_fwd_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    max_usize <- scalar_cast U32 Usize core_num_u32_max_c;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let capacity := vec_len (Hashmap_list_t T) v in
+      n1 <- usize_div max_usize 2%usize;
+      let (i1, i2) := p in
+      i3 <- usize_div n1 i1;
+      if capacity s<= i3
+      then (
+        i4 <- usize_mul capacity 2%usize;
+        ntable <- hashmap_hash_map_new_with_capacity_fwd T n0 i4 i1 i2;
+        p0 <- hashmap_hash_map_move_elements_fwd_back T n0 ntable v (0%usize);
+        let (ntable0, _) := p0 in
+        match ntable0 with
+        | mkHashmap_hash_map_t i5 p1 i6 v0 =>
+          Return (mkHashmap_hash_map_t i (i1, i2) i6 v0)
+        end)
+      else Return (mkHashmap_hash_map_t i (i1, i2) i0 v)
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::insert] *)
+Definition hashmap_hash_map_insert_fwd_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (value : T)
+  :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    self0 <- hashmap_hash_map_insert_no_resize_fwd_back T n0 self key value;
+    i <- hashmap_hash_map_len_fwd T self0;
+    match self0 with
+    | mkHashmap_hash_map_t i0 p i1 v =>
+      if i s> i1
+      then (
+        self1 <-
+          hashmap_hash_map_try_resize_fwd_back T n0 (mkHashmap_hash_map_t i0 p
+            i1 v);
+        Return self1)
+      else Return (mkHashmap_hash_map_t i0 p i1 v)
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list] *)
+Fixpoint hashmap_hash_map_contains_key_in_list_fwd
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result bool :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey t ls0 =>
+      if ckey s= key
+      then Return true
+      else (
+        b <- hashmap_hash_map_contains_key_in_list_fwd T n0 key ls0; Return b)
+    | HashmapListNil => Return false
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::contains_key] *)
+Definition hashmap_hash_map_contains_key_fwd
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
+  result bool
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_fwd (Hashmap_list_t T) v hash_mod;
+      b <- hashmap_hash_map_contains_key_in_list_fwd T n0 key l;
+      Return b
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get_in_list] *)
+Fixpoint hashmap_hash_map_get_in_list_fwd
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result T :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey cvalue ls0 =>
+      if ckey s= key
+      then Return cvalue
+      else (t <- hashmap_hash_map_get_in_list_fwd T n0 key ls0; Return t)
+    | HashmapListNil => Fail_ Failure
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get] *)
+Definition hashmap_hash_map_get_fwd
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
+  result T
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_fwd (Hashmap_list_t T) v hash_mod;
+      t <- hashmap_hash_map_get_in_list_fwd T n0 key l;
+      Return t
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] *)
+Fixpoint hashmap_hash_map_get_mut_in_list_fwd
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result T :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey cvalue ls0 =>
+      if ckey s= key
+      then Return cvalue
+      else (t <- hashmap_hash_map_get_mut_in_list_fwd T n0 key ls0; Return t)
+    | HashmapListNil => Fail_ Failure
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] *)
+Fixpoint hashmap_hash_map_get_mut_in_list_back
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) (ret : T) :
+  result (Hashmap_list_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey cvalue ls0 =>
+      if ckey s= key
+      then Return (HashmapListCons ckey ret ls0)
+      else (
+        ls1 <- hashmap_hash_map_get_mut_in_list_back T n0 key ls0 ret;
+        Return (HashmapListCons ckey cvalue ls1))
+    | HashmapListNil => Fail_ Failure
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get_mut] *)
+Definition hashmap_hash_map_get_mut_fwd
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
+  result T
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
+      t <- hashmap_hash_map_get_mut_in_list_fwd T n0 key l;
+      Return t
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::get_mut] *)
+Definition hashmap_hash_map_get_mut_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (ret : T) :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
+      l0 <- hashmap_hash_map_get_mut_in_list_back T n0 key l ret;
+      v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
+      Return (mkHashmap_hash_map_t i p i0 v0)
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::remove_from_list] *)
+Fixpoint hashmap_hash_map_remove_from_list_fwd
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) :
+  result (option T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey t tl =>
+      if ckey s= key
+      then
+        let mv_ls :=
+          mem_replace_fwd (Hashmap_list_t T) (HashmapListCons ckey t tl)
+            HashmapListNil in
+        match mv_ls with
+        | HashmapListCons i cvalue tl0 => Return (Some cvalue)
+        | HashmapListNil => Fail_ Failure
+        end
+      else (
+        opt <- hashmap_hash_map_remove_from_list_fwd T n0 key tl; Return opt)
+    | HashmapListNil => Return None
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::remove_from_list] *)
+Fixpoint hashmap_hash_map_remove_from_list_back
+  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) :
+  result (Hashmap_list_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    match ls with
+    | HashmapListCons ckey t tl =>
+      if ckey s= key
+      then
+        let mv_ls :=
+          mem_replace_fwd (Hashmap_list_t T) (HashmapListCons ckey t tl)
+            HashmapListNil in
+        match mv_ls with
+        | HashmapListCons i cvalue tl0 => Return tl0
+        | HashmapListNil => Fail_ Failure
+        end
+      else (
+        tl0 <- hashmap_hash_map_remove_from_list_back T n0 key tl;
+        Return (HashmapListCons ckey t tl0))
+    | HashmapListNil => Return HashmapListNil
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::remove] *)
+Definition hashmap_hash_map_remove_fwd
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
+  result (option T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
+      x <- hashmap_hash_map_remove_from_list_fwd T n0 key l;
+      match x with
+      | None => Return None
+      | Some x0 => i2 <- usize_sub i 1%usize; let _ := i2 in Return (Some x0)
+      end
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::HashMap::{0}::remove] *)
+Definition hashmap_hash_map_remove_back
+  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
+  result (Hashmap_hash_map_t T)
+  :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hash <- hashmap_hash_key_fwd key;
+    match self with
+    | mkHashmap_hash_map_t i p i0 v =>
+      let i1 := vec_len (Hashmap_list_t T) v in
+      hash_mod <- usize_rem hash i1;
+      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
+      x <- hashmap_hash_map_remove_from_list_fwd T n0 key l;
+      match x with
+      | None =>
+        l0 <- hashmap_hash_map_remove_from_list_back T n0 key l;
+        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
+        Return (mkHashmap_hash_map_t i p i0 v0)
+      | Some x0 =>
+        i2 <- usize_sub i 1%usize;
+        l0 <- hashmap_hash_map_remove_from_list_back T n0 key l;
+        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
+        Return (mkHashmap_hash_map_t i2 p i0 v0)
+      end
+    end
+  end
+.
+
+(** [hashmap_main::hashmap::test1] *)
+Definition hashmap_test1_fwd (n : nat) : result unit :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    hm <- hashmap_hash_map_new_fwd u64 n0;
+    hm0 <- hashmap_hash_map_insert_fwd_back u64 n0 hm (0%usize) (42%u64);
+    hm1 <- hashmap_hash_map_insert_fwd_back u64 n0 hm0 (128%usize) (18%u64);
+    hm2 <- hashmap_hash_map_insert_fwd_back u64 n0 hm1 (1024%usize) (138%u64);
+    hm3 <- hashmap_hash_map_insert_fwd_back u64 n0 hm2 (1056%usize) (256%u64);
+    i <- hashmap_hash_map_get_fwd u64 n0 hm3 (128%usize);
+    if negb (i s= 18%u64)
+    then Fail_ Failure
+    else (
+      hm4 <- hashmap_hash_map_get_mut_back u64 n0 hm3 (1024%usize) (56%u64);
+      i0 <- hashmap_hash_map_get_fwd u64 n0 hm4 (1024%usize);
+      if negb (i0 s= 56%u64)
+      then Fail_ Failure
+      else (
+        x <- hashmap_hash_map_remove_fwd u64 n0 hm4 (1024%usize);
+        match x with
+        | None => Fail_ Failure
+        | Some x0 =>
+          if negb (x0 s= 56%u64)
+          then Fail_ Failure
+          else (
+            hm5 <- hashmap_hash_map_remove_back u64 n0 hm4 (1024%usize);
+            i1 <- hashmap_hash_map_get_fwd u64 n0 hm5 (0%usize);
+            if negb (i1 s= 42%u64)
+            then Fail_ Failure
+            else (
+              i2 <- hashmap_hash_map_get_fwd u64 n0 hm5 (128%usize);
+              if negb (i2 s= 18%u64)
+              then Fail_ Failure
+              else (
+                i3 <- hashmap_hash_map_get_fwd u64 n0 hm5 (1056%usize);
+                if negb (i3 s= 256%u64) then Fail_ Failure else Return tt)))
+        end))
+  end
+.
+
+(** [hashmap_main::insert_on_disk] *)
+Definition insert_on_disk_fwd
+  (n : nat) (key : usize) (value : u64) (st : state) : result (state * unit) :=
+  match n with
+  | O => Fail_ OutOfFuel
+  | S n0 =>
+    p <- hashmap_utils_deserialize_fwd st;
+    let (st0, hm) := p in
+    hm0 <- hashmap_hash_map_insert_fwd_back u64 n0 hm key value;
+    p0 <- hashmap_utils_serialize_fwd hm0 st0;
+    let (st1, _) := p0 in
+    Return (st1, tt)
+  end
+.
+
+(** [hashmap_main::main] *)
+Definition main_fwd : result unit := Return tt.
+
+(** Unit test for [hashmap_main::main] *)
+Check (main_fwd )%return.
+
+End HashmapMain_Funs .
diff --git a/tests/coq/hashmap_on_disk/HashmapMain_Opaque.v b/tests/coq/hashmap_on_disk/HashmapMain_Opaque.v
new file mode 100644
index 00000000..6152b94b
--- /dev/null
+++ b/tests/coq/hashmap_on_disk/HashmapMain_Opaque.v
@@ -0,0 +1,21 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [hashmap_main]: opaque function definitions *)
+Require Import Primitives.
+Import Primitives.
+Require Import Coq.ZArith.ZArith.
+Local Open Scope Primitives_scope.
+Require Export HashmapMain_Types.
+Import HashmapMain_Types.
+Module HashmapMain_Opaque.
+
+(** [hashmap_main::hashmap_utils::deserialize] *)
+Axiom hashmap_utils_deserialize_fwd
+  : state -> result (state * (Hashmap_hash_map_t u64))
+.
+
+(** [hashmap_main::hashmap_utils::serialize] *)
+Axiom hashmap_utils_serialize_fwd
+  : Hashmap_hash_map_t u64 -> state -> result (state * unit)
+.
+
+End HashmapMain_Opaque .
diff --git a/tests/coq/hashmap_on_disk/HashmapMain_Types.v b/tests/coq/hashmap_on_disk/HashmapMain_Types.v
new file mode 100644
index 00000000..01243baf
--- /dev/null
+++ b/tests/coq/hashmap_on_disk/HashmapMain_Types.v
@@ -0,0 +1,41 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [hashmap_main]: type definitions *)
+Require Import Primitives.
+Import Primitives.
+Require Import Coq.ZArith.ZArith.
+Local Open Scope Primitives_scope.
+Module HashmapMain_Types.
+
+(** [hashmap_main::hashmap::List] *)
+Inductive Hashmap_list_t (T : Type) :=
+| HashmapListCons : usize -> T -> Hashmap_list_t T -> Hashmap_list_t T
+| HashmapListNil : Hashmap_list_t T
+.
+
+Arguments HashmapListCons {T} _ _ _.
+Arguments HashmapListNil {T}.
+
+(** [hashmap_main::hashmap::HashMap] *)
+Record Hashmap_hash_map_t (T : Type) :=
+mkHashmap_hash_map_t {
+  Hashmap_hash_map_num_entries : usize;
+  Hashmap_hash_map_max_load_factor : (usize * usize);
+  Hashmap_hash_map_max_load : usize;
+  Hashmap_hash_map_slots : vec (Hashmap_list_t T);
+}
+.
+
+Arguments mkHashmap_hash_map_t {T} _ _ _ _.
+Arguments Hashmap_hash_map_num_entries {T}.
+Arguments Hashmap_hash_map_max_load_factor {T}.
+Arguments Hashmap_hash_map_max_load {T}.
+Arguments Hashmap_hash_map_slots {T}.
+
+(** [core::num::u32::{9}::MAX] *)
+Definition core_num_u32_max_body : result u32 := Return (4294967295%u32).
+Definition core_num_u32_max_c : u32 := core_num_u32_max_body%global.
+
+(** The state type used in the state-error monad *)
+Axiom state : Type.
+
+End HashmapMain_Types .
diff --git a/tests/coq/hashmap_on_disk/HashmapMain__Funs.v b/tests/coq/hashmap_on_disk/HashmapMain__Funs.v
deleted file mode 100644
index 249adbe9..00000000
--- a/tests/coq/hashmap_on_disk/HashmapMain__Funs.v
+++ /dev/null
@@ -1,598 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: function definitions *)
-Require Import Primitives.
-Import Primitives.
-Require Import Coq.ZArith.ZArith.
-Local Open Scope Primitives_scope.
-Require Export HashmapMain__Types.
-Import HashmapMain__Types.
-Require Export HashmapMain__Opaque.
-Import HashmapMain__Opaque.
-Module HashmapMain__Funs.
-
-(** [hashmap_main::hashmap::hash_key] *)
-Definition hashmap_hash_key_fwd (k : usize) : result usize := Return k.
-
-(** [hashmap_main::hashmap::HashMap::{0}::allocate_slots] *)
-Fixpoint hashmap_hash_map_allocate_slots_fwd
-  (T : Type) (n : nat) (slots : vec (Hashmap_list_t T)) (n0 : usize) :
-  result (vec (Hashmap_list_t T))
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n1 =>
-    if n0 s= 0%usize
-    then Return slots
-    else (
-      slots0 <- vec_push_back (Hashmap_list_t T) slots HashmapListNil;
-      i <- usize_sub n0 1%usize;
-      v <- hashmap_hash_map_allocate_slots_fwd T n1 slots0 i;
-      Return v)
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::new_with_capacity] *)
-Definition hashmap_hash_map_new_with_capacity_fwd
-  (T : Type) (n : nat) (capacity : usize) (max_load_dividend : usize)
-  (max_load_divisor : usize) :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    let v := vec_new (Hashmap_list_t T) in
-    slots <- hashmap_hash_map_allocate_slots_fwd T n0 v capacity;
-    i <- usize_mul capacity max_load_dividend;
-    i0 <- usize_div i max_load_divisor;
-    Return (mkHashmap_hash_map_t (0%usize) (max_load_dividend,
-      max_load_divisor) i0 slots)
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::new] *)
-Definition hashmap_hash_map_new_fwd
-  (T : Type) (n : nat) : result (Hashmap_hash_map_t T) :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hm <-
-      hashmap_hash_map_new_with_capacity_fwd T n0 (32%usize) (4%usize)
-        (5%usize);
-    Return hm
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::clear_slots] *)
-Fixpoint hashmap_hash_map_clear_slots_fwd_back
-  (T : Type) (n : nat) (slots : vec (Hashmap_list_t T)) (i : usize) :
-  result (vec (Hashmap_list_t T))
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    let i0 := vec_len (Hashmap_list_t T) slots in
-    if i s< i0
-    then (
-      slots0 <- vec_index_mut_back (Hashmap_list_t T) slots i HashmapListNil;
-      i1 <- usize_add i 1%usize;
-      slots1 <- hashmap_hash_map_clear_slots_fwd_back T n0 slots0 i1;
-      Return slots1)
-    else Return slots
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::clear] *)
-Definition hashmap_hash_map_clear_fwd_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      v0 <- hashmap_hash_map_clear_slots_fwd_back T n0 v (0%usize);
-      Return (mkHashmap_hash_map_t (0%usize) p i0 v0)
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::len] *)
-Definition hashmap_hash_map_len_fwd
-  (T : Type) (self : Hashmap_hash_map_t T) : result usize :=
-  match self with | mkHashmap_hash_map_t i p i0 v => Return i end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::insert_in_list] *)
-Fixpoint hashmap_hash_map_insert_in_list_fwd
-  (T : Type) (n : nat) (key : usize) (value : T) (ls : Hashmap_list_t T) :
-  result bool
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey cvalue ls0 =>
-      if ckey s= key
-      then Return false
-      else (
-        b <- hashmap_hash_map_insert_in_list_fwd T n0 key value ls0; Return b)
-    | HashmapListNil => Return true
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::insert_in_list] *)
-Fixpoint hashmap_hash_map_insert_in_list_back
-  (T : Type) (n : nat) (key : usize) (value : T) (ls : Hashmap_list_t T) :
-  result (Hashmap_list_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey cvalue ls0 =>
-      if ckey s= key
-      then Return (HashmapListCons ckey value ls0)
-      else (
-        ls1 <- hashmap_hash_map_insert_in_list_back T n0 key value ls0;
-        Return (HashmapListCons ckey cvalue ls1))
-    | HashmapListNil =>
-      let l := HashmapListNil in Return (HashmapListCons key value l)
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::insert_no_resize] *)
-Definition hashmap_hash_map_insert_no_resize_fwd_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (value : T)
-  :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
-      inserted <- hashmap_hash_map_insert_in_list_fwd T n0 key value l;
-      if inserted
-      then (
-        i2 <- usize_add i 1%usize;
-        l0 <- hashmap_hash_map_insert_in_list_back T n0 key value l;
-        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
-        Return (mkHashmap_hash_map_t i2 p i0 v0))
-      else (
-        l0 <- hashmap_hash_map_insert_in_list_back T n0 key value l;
-        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
-        Return (mkHashmap_hash_map_t i p i0 v0))
-    end
-  end
-.
-
-(** [core::num::u32::{9}::MAX] *)
-Definition core_num_u32_max_body : result u32 := Return (4294967295%u32).
-Definition core_num_u32_max_c : u32 := core_num_u32_max_body%global.
-
-(** [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list] *)
-Fixpoint hashmap_hash_map_move_elements_from_list_fwd_back
-  (T : Type) (n : nat) (ntable : Hashmap_hash_map_t T) (ls : Hashmap_list_t T)
-  :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons k v tl =>
-      ntable0 <- hashmap_hash_map_insert_no_resize_fwd_back T n0 ntable k v;
-      ntable1 <-
-        hashmap_hash_map_move_elements_from_list_fwd_back T n0 ntable0 tl;
-      Return ntable1
-    | HashmapListNil => Return ntable
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::move_elements] *)
-Fixpoint hashmap_hash_map_move_elements_fwd_back
-  (T : Type) (n : nat) (ntable : Hashmap_hash_map_t T)
-  (slots : vec (Hashmap_list_t T)) (i : usize) :
-  result ((Hashmap_hash_map_t T) * (vec (Hashmap_list_t T)))
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    let i0 := vec_len (Hashmap_list_t T) slots in
-    if i s< i0
-    then (
-      l <- vec_index_mut_fwd (Hashmap_list_t T) slots i;
-      let ls := mem_replace_fwd (Hashmap_list_t T) l HashmapListNil in
-      ntable0 <-
-        hashmap_hash_map_move_elements_from_list_fwd_back T n0 ntable ls;
-      let l0 := mem_replace_back (Hashmap_list_t T) l HashmapListNil in
-      slots0 <- vec_index_mut_back (Hashmap_list_t T) slots i l0;
-      i1 <- usize_add i 1%usize;
-      p <- hashmap_hash_map_move_elements_fwd_back T n0 ntable0 slots0 i1;
-      let (ntable1, slots1) := p in
-      Return (ntable1, slots1))
-    else Return (ntable, slots)
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::try_resize] *)
-Definition hashmap_hash_map_try_resize_fwd_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    max_usize <- scalar_cast U32 Usize core_num_u32_max_c;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let capacity := vec_len (Hashmap_list_t T) v in
-      n1 <- usize_div max_usize 2%usize;
-      let (i1, i2) := p in
-      i3 <- usize_div n1 i1;
-      if capacity s<= i3
-      then (
-        i4 <- usize_mul capacity 2%usize;
-        ntable <- hashmap_hash_map_new_with_capacity_fwd T n0 i4 i1 i2;
-        p0 <- hashmap_hash_map_move_elements_fwd_back T n0 ntable v (0%usize);
-        let (ntable0, _) := p0 in
-        match ntable0 with
-        | mkHashmap_hash_map_t i5 p1 i6 v0 =>
-          Return (mkHashmap_hash_map_t i (i1, i2) i6 v0)
-        end)
-      else Return (mkHashmap_hash_map_t i (i1, i2) i0 v)
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::insert] *)
-Definition hashmap_hash_map_insert_fwd_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (value : T)
-  :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    self0 <- hashmap_hash_map_insert_no_resize_fwd_back T n0 self key value;
-    i <- hashmap_hash_map_len_fwd T self0;
-    match self0 with
-    | mkHashmap_hash_map_t i0 p i1 v =>
-      if i s> i1
-      then (
-        self1 <-
-          hashmap_hash_map_try_resize_fwd_back T n0 (mkHashmap_hash_map_t i0 p
-            i1 v);
-        Return self1)
-      else Return (mkHashmap_hash_map_t i0 p i1 v)
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list] *)
-Fixpoint hashmap_hash_map_contains_key_in_list_fwd
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result bool :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey t ls0 =>
-      if ckey s= key
-      then Return true
-      else (
-        b <- hashmap_hash_map_contains_key_in_list_fwd T n0 key ls0; Return b)
-    | HashmapListNil => Return false
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::contains_key] *)
-Definition hashmap_hash_map_contains_key_fwd
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
-  result bool
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_fwd (Hashmap_list_t T) v hash_mod;
-      b <- hashmap_hash_map_contains_key_in_list_fwd T n0 key l;
-      Return b
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get_in_list] *)
-Fixpoint hashmap_hash_map_get_in_list_fwd
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result T :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey cvalue ls0 =>
-      if ckey s= key
-      then Return cvalue
-      else (t <- hashmap_hash_map_get_in_list_fwd T n0 key ls0; Return t)
-    | HashmapListNil => Fail_ Failure
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get] *)
-Definition hashmap_hash_map_get_fwd
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
-  result T
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_fwd (Hashmap_list_t T) v hash_mod;
-      t <- hashmap_hash_map_get_in_list_fwd T n0 key l;
-      Return t
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] *)
-Fixpoint hashmap_hash_map_get_mut_in_list_fwd
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) : result T :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey cvalue ls0 =>
-      if ckey s= key
-      then Return cvalue
-      else (t <- hashmap_hash_map_get_mut_in_list_fwd T n0 key ls0; Return t)
-    | HashmapListNil => Fail_ Failure
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] *)
-Fixpoint hashmap_hash_map_get_mut_in_list_back
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) (ret : T) :
-  result (Hashmap_list_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey cvalue ls0 =>
-      if ckey s= key
-      then Return (HashmapListCons ckey ret ls0)
-      else (
-        ls1 <- hashmap_hash_map_get_mut_in_list_back T n0 key ls0 ret;
-        Return (HashmapListCons ckey cvalue ls1))
-    | HashmapListNil => Fail_ Failure
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get_mut] *)
-Definition hashmap_hash_map_get_mut_fwd
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
-  result T
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
-      t <- hashmap_hash_map_get_mut_in_list_fwd T n0 key l;
-      Return t
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::get_mut] *)
-Definition hashmap_hash_map_get_mut_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) (ret : T) :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
-      l0 <- hashmap_hash_map_get_mut_in_list_back T n0 key l ret;
-      v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
-      Return (mkHashmap_hash_map_t i p i0 v0)
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::remove_from_list] *)
-Fixpoint hashmap_hash_map_remove_from_list_fwd
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) :
-  result (option T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey t tl =>
-      if ckey s= key
-      then
-        let mv_ls :=
-          mem_replace_fwd (Hashmap_list_t T) (HashmapListCons ckey t tl)
-            HashmapListNil in
-        match mv_ls with
-        | HashmapListCons i cvalue tl0 => Return (Some cvalue)
-        | HashmapListNil => Fail_ Failure
-        end
-      else (
-        opt <- hashmap_hash_map_remove_from_list_fwd T n0 key tl; Return opt)
-    | HashmapListNil => Return None
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::remove_from_list] *)
-Fixpoint hashmap_hash_map_remove_from_list_back
-  (T : Type) (n : nat) (key : usize) (ls : Hashmap_list_t T) :
-  result (Hashmap_list_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    match ls with
-    | HashmapListCons ckey t tl =>
-      if ckey s= key
-      then
-        let mv_ls :=
-          mem_replace_fwd (Hashmap_list_t T) (HashmapListCons ckey t tl)
-            HashmapListNil in
-        match mv_ls with
-        | HashmapListCons i cvalue tl0 => Return tl0
-        | HashmapListNil => Fail_ Failure
-        end
-      else (
-        tl0 <- hashmap_hash_map_remove_from_list_back T n0 key tl;
-        Return (HashmapListCons ckey t tl0))
-    | HashmapListNil => Return HashmapListNil
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::remove] *)
-Definition hashmap_hash_map_remove_fwd
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
-  result (option T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
-      x <- hashmap_hash_map_remove_from_list_fwd T n0 key l;
-      match x with
-      | None => Return None
-      | Some x0 => i2 <- usize_sub i 1%usize; let _ := i2 in Return (Some x0)
-      end
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::HashMap::{0}::remove] *)
-Definition hashmap_hash_map_remove_back
-  (T : Type) (n : nat) (self : Hashmap_hash_map_t T) (key : usize) :
-  result (Hashmap_hash_map_t T)
-  :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hash <- hashmap_hash_key_fwd key;
-    match self with
-    | mkHashmap_hash_map_t i p i0 v =>
-      let i1 := vec_len (Hashmap_list_t T) v in
-      hash_mod <- usize_rem hash i1;
-      l <- vec_index_mut_fwd (Hashmap_list_t T) v hash_mod;
-      x <- hashmap_hash_map_remove_from_list_fwd T n0 key l;
-      match x with
-      | None =>
-        l0 <- hashmap_hash_map_remove_from_list_back T n0 key l;
-        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
-        Return (mkHashmap_hash_map_t i p i0 v0)
-      | Some x0 =>
-        i2 <- usize_sub i 1%usize;
-        l0 <- hashmap_hash_map_remove_from_list_back T n0 key l;
-        v0 <- vec_index_mut_back (Hashmap_list_t T) v hash_mod l0;
-        Return (mkHashmap_hash_map_t i2 p i0 v0)
-      end
-    end
-  end
-.
-
-(** [hashmap_main::hashmap::test1] *)
-Definition hashmap_test1_fwd (n : nat) : result unit :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    hm <- hashmap_hash_map_new_fwd u64 n0;
-    hm0 <- hashmap_hash_map_insert_fwd_back u64 n0 hm (0%usize) (42%u64);
-    hm1 <- hashmap_hash_map_insert_fwd_back u64 n0 hm0 (128%usize) (18%u64);
-    hm2 <- hashmap_hash_map_insert_fwd_back u64 n0 hm1 (1024%usize) (138%u64);
-    hm3 <- hashmap_hash_map_insert_fwd_back u64 n0 hm2 (1056%usize) (256%u64);
-    i <- hashmap_hash_map_get_fwd u64 n0 hm3 (128%usize);
-    if negb (i s= 18%u64)
-    then Fail_ Failure
-    else (
-      hm4 <- hashmap_hash_map_get_mut_back u64 n0 hm3 (1024%usize) (56%u64);
-      i0 <- hashmap_hash_map_get_fwd u64 n0 hm4 (1024%usize);
-      if negb (i0 s= 56%u64)
-      then Fail_ Failure
-      else (
-        x <- hashmap_hash_map_remove_fwd u64 n0 hm4 (1024%usize);
-        match x with
-        | None => Fail_ Failure
-        | Some x0 =>
-          if negb (x0 s= 56%u64)
-          then Fail_ Failure
-          else (
-            hm5 <- hashmap_hash_map_remove_back u64 n0 hm4 (1024%usize);
-            i1 <- hashmap_hash_map_get_fwd u64 n0 hm5 (0%usize);
-            if negb (i1 s= 42%u64)
-            then Fail_ Failure
-            else (
-              i2 <- hashmap_hash_map_get_fwd u64 n0 hm5 (128%usize);
-              if negb (i2 s= 18%u64)
-              then Fail_ Failure
-              else (
-                i3 <- hashmap_hash_map_get_fwd u64 n0 hm5 (1056%usize);
-                if negb (i3 s= 256%u64) then Fail_ Failure else Return tt)))
-        end))
-  end
-.
-
-(** [hashmap_main::insert_on_disk] *)
-Definition insert_on_disk_fwd
-  (n : nat) (key : usize) (value : u64) (st : state) : result (state * unit) :=
-  match n with
-  | O => Fail_ OutOfFuel
-  | S n0 =>
-    p <- hashmap_utils_deserialize_fwd st;
-    let (st0, hm) := p in
-    hm0 <- hashmap_hash_map_insert_fwd_back u64 n0 hm key value;
-    p0 <- hashmap_utils_serialize_fwd hm0 st0;
-    let (st1, _) := p0 in
-    Return (st1, tt)
-  end
-.
-
-(** [hashmap_main::main] *)
-Definition main_fwd : result unit := Return tt.
-
-(** Unit test for [hashmap_main::main] *)
-Check (main_fwd )%return.
-
-End HashmapMain__Funs .
diff --git a/tests/coq/hashmap_on_disk/HashmapMain__Opaque.v b/tests/coq/hashmap_on_disk/HashmapMain__Opaque.v
deleted file mode 100644
index 4b6db927..00000000
--- a/tests/coq/hashmap_on_disk/HashmapMain__Opaque.v
+++ /dev/null
@@ -1,21 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: opaque function definitions *)
-Require Import Primitives.
-Import Primitives.
-Require Import Coq.ZArith.ZArith.
-Local Open Scope Primitives_scope.
-Require Export HashmapMain__Types.
-Import HashmapMain__Types.
-Module HashmapMain__Opaque.
-
-(** [hashmap_main::hashmap_utils::deserialize] *)
-Axiom hashmap_utils_deserialize_fwd
-  : state -> result (state * (Hashmap_hash_map_t u64))
-.
-
-(** [hashmap_main::hashmap_utils::serialize] *)
-Axiom hashmap_utils_serialize_fwd
-  : Hashmap_hash_map_t u64 -> state -> result (state * unit)
-.
-
-End HashmapMain__Opaque .
diff --git a/tests/coq/hashmap_on_disk/HashmapMain__Types.v b/tests/coq/hashmap_on_disk/HashmapMain__Types.v
deleted file mode 100644
index 5d609937..00000000
--- a/tests/coq/hashmap_on_disk/HashmapMain__Types.v
+++ /dev/null
@@ -1,41 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: type definitions *)
-Require Import Primitives.
-Import Primitives.
-Require Import Coq.ZArith.ZArith.
-Local Open Scope Primitives_scope.
-Module HashmapMain__Types.
-
-(** [hashmap_main::hashmap::List] *)
-Inductive Hashmap_list_t (T : Type) :=
-| HashmapListCons : usize -> T -> Hashmap_list_t T -> Hashmap_list_t T
-| HashmapListNil : Hashmap_list_t T
-.
-
-Arguments HashmapListCons {T} _ _ _.
-Arguments HashmapListNil {T}.
-
-(** [hashmap_main::hashmap::HashMap] *)
-Record Hashmap_hash_map_t (T : Type) :=
-mkHashmap_hash_map_t {
-  Hashmap_hash_map_num_entries : usize;
-  Hashmap_hash_map_max_load_factor : (usize * usize);
-  Hashmap_hash_map_max_load : usize;
-  Hashmap_hash_map_slots : vec (Hashmap_list_t T);
-}
-.
-
-Arguments mkHashmap_hash_map_t {T} _ _ _ _.
-Arguments Hashmap_hash_map_num_entries {T}.
-Arguments Hashmap_hash_map_max_load_factor {T}.
-Arguments Hashmap_hash_map_max_load {T}.
-Arguments Hashmap_hash_map_slots {T}.
-
-(** [core::num::u32::{9}::MAX] *)
-Definition core_num_u32_max_body : result u32 := Return (4294967295%u32).
-Definition core_num_u32_max_c : u32 := core_num_u32_max_body%global.
-
-(** The state type used in the state-error monad *)
-Axiom state : Type.
-
-End HashmapMain__Types .
-- 
cgit v1.2.3