fix: bad conflict resolutions during rebase

Author: freshtonic

packages/cipherstash-proxy-integration/src/common.rs

@@ -200,6 +200,11 @@ pub async fn simple_query_with_null(sql: &str) -> Vec<Option<String>> {
         .collect()
 }
 
+pub async fn insert(sql: &str, params: &[&(dyn ToSql + Sync)]) {
+    let client = connect_with_tls(PROXY).await;
+    client.query(sql, params).await.unwrap();
+}
+
 pub async fn insert_jsonb() -> Value {
     let id = random_id();
 
@@ -214,6 +219,7 @@ pub async fn insert_jsonb() -> Value {
     });
 
     let sql = "INSERT INTO encrypted (id, encrypted_jsonb) VALUES ($1, $2)".to_string();
+
     insert(&sql, &[&id, &encrypted_jsonb]).await;
 
     encrypted_jsonb

packages/cipherstash-proxy-integration/src/support/assert.rs

@@ -7,13 +7,3 @@ where
         assert_eq!(e, a);
     }
 }
-
-pub fn assert_expected_as_string<T>(expected: &[T], actual: &[String])
-where
-    T: std::fmt::Display + PartialEq + std::fmt::Debug,
-{
-    assert_eq!(expected.len(), actual.len());
-    for (e, a) in expected.iter().zip(actual) {
-        assert_eq!(e.to_string(), *a);
-    }
-}

packages/cipherstash-proxy-integration/src/support/mod.rs

@@ -1,2 +1,4 @@
+#[cfg(test)]
 pub mod assert;
+
 pub mod json_path;