Use BTreeMap and BTreeSet instead of HashMap and HashSet

Author: szg251

runtimes/rust/lbr-prelude/src/generators/correct.rs

@@ -2,12 +2,12 @@ use num_bigint::{BigInt, Sign};
 use proptest::arbitrary::{any, StrategyFor};
 use proptest::char::CharStrategy;
 use proptest::collection::vec;
-use proptest::collection::{hash_map, hash_set};
+use proptest::collection::{btree_map, btree_set};
 use proptest::option;
 use proptest::prelude::{prop_oneof, Just};
 use proptest::result::maybe_err;
 use proptest::strategy::Strategy;
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeMap, BTreeSet};
 
 /// Strategy to generate an arbitrary boolean
 pub fn arb_bool() -> StrategyFor<bool> {
@@ -47,11 +47,12 @@ pub fn arb_text() -> StrategyFor<String> {
 
 /// Strategy to generate a complicated data structure
 pub fn arb_complicated(
-) -> impl Strategy<Value = HashMap<String, Result<HashSet<char>, Option<Result<Vec<u8>, bool>>>>> {
-    hash_map(
+) -> impl Strategy<Value = BTreeMap<String, Result<BTreeSet<char>, Option<Result<Vec<u8>, bool>>>>>
+{
+    btree_map(
         arb_text(),
         maybe_err(
-            hash_set(arb_char(), 20),
+            btree_set(arb_char(), 20),
             option::of(maybe_err(arb_bytes(), arb_bool())),
         ),
         20,

runtimes/rust/lbr-prelude/src/json.rs

@@ -3,8 +3,7 @@ use core::str::FromStr;
 use data_encoding::BASE64;
 use num_bigint::BigInt;
 use serde_json::{self, Value};
-use std::collections::{HashMap, HashSet};
-use std::hash::Hash;
+use std::collections::{BTreeMap, BTreeSet};
 
 /// Trait that lbf-prelude::json class maps to
 pub trait Json {
@@ -209,9 +208,9 @@ where
     }
 }
 
-impl<T> Json for HashSet<T>
+impl<T> Json for BTreeSet<T>
 where
-    T: Json + Eq + Hash,
+    T: Json + Eq + Ord,
 {
     fn to_json(&self) -> Result<Value, Error> {
         let values = self
@@ -227,7 +226,7 @@ where
             let set = vec
                 .iter()
                 .map(|val| T::from_json(val.clone()))
-                .collect::<Result<HashSet<T>, Error>>()?;
+                .collect::<Result<BTreeSet<T>, Error>>()?;
 
             if set.len() == vec.len() {
                 Ok(set)
@@ -241,9 +240,9 @@ where
     }
 }
 
-impl<K, V> Json for HashMap<K, V>
+impl<K, V> Json for BTreeMap<K, V>
 where
-    K: Json + Eq + Hash,
+    K: Json + Eq + Ord,
     V: Json,
 {
     fn to_json(&self) -> Result<Value, Error> {
@@ -260,7 +259,7 @@ where
             let set = vec
                 .iter()
                 .map(|kv_tuple| <(K, V)>::from_json(kv_tuple.clone()))
-                .collect::<Result<HashMap<K, V>, Error>>()?;
+                .collect::<Result<BTreeMap<K, V>, Error>>()?;
 
             if set.len() == vec.len() {
                 Ok(set)

runtimes/rust/lbr-prelude/tests/main.rs

@@ -6,7 +6,7 @@ mod tests {
             arb_bool, arb_bytes, arb_char, arb_complicated, arb_integer, arb_text,
         };
         use lbr_prelude::json::Json;
-        use proptest::collection::{hash_map, hash_set, vec};
+        use proptest::collection::{btree_map, btree_set, vec};
         use proptest::option;
         use proptest::prelude::*;
         use proptest::result::maybe_err;
@@ -76,14 +76,14 @@ mod tests {
 
         proptest! {
             #[test]
-            fn test_set(val in hash_set(arb_integer(), 20)) {
+            fn test_set(val in btree_set(arb_integer(), 20)) {
                 assert_eq!(val, from_to_json(&val)?);
             }
         }
 
         proptest! {
             #[test]
-            fn test_map(val in hash_map(arb_integer(), arb_text(), 20)) {
+            fn test_map(val in btree_map(arb_integer(), arb_text(), 20)) {
                 assert_eq!(val, from_to_json(&val)?);
             }
         }