From 9b0c07a70f117a290538f05f28efd8556bc4b751 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 28 Mar 2024 09:46:53 -0700 Subject: [PATCH] Remove inst dependency At the current pace of development, keeping up with churn in the insta crate is more work than manually updating the two test values we have. Remove the dependency in favour of inline static &str literals. --- ppoprf/Cargo.toml | 1 - ppoprf/src/ppoprf.rs | 8 ++++---- .../ppoprf__ppoprf__tests__pk_serialization.snap | 5 ----- .../ppoprf__ppoprf__tests__proof_serialization.snap | 5 ----- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 ppoprf/src/snapshots/ppoprf__ppoprf__tests__pk_serialization.snap delete mode 100644 ppoprf/src/snapshots/ppoprf__ppoprf__tests__proof_serialization.snap diff --git a/ppoprf/Cargo.toml b/ppoprf/Cargo.toml index 7121716f..6f8a5a25 100644 --- a/ppoprf/Cargo.toml +++ b/ppoprf/Cargo.toml @@ -28,7 +28,6 @@ env_logger = "0.11.3" log = "0.4.21" reqwest = { version = "0.12.0", features = [ "blocking", "json" ] } dotenvy = "0.15.7" -insta = "1.36.1" tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "time"] } warp = "0.3.6" diff --git a/ppoprf/src/ppoprf.rs b/ppoprf/src/ppoprf.rs index 26e0eb2c..1efae0d2 100644 --- a/ppoprf/src/ppoprf.rs +++ b/ppoprf/src/ppoprf.rs @@ -441,8 +441,6 @@ fn strobe_hash(input: &[u8], label: &str, out: &mut [u8]) { mod tests { use super::*; - use insta::assert_snapshot; - fn end_to_end_eval_check_no_proof( server: &Server, c_input: &[u8], @@ -573,7 +571,8 @@ mod tests { .serialize_to_bincode() .expect("Should serialize to bincode"); - assert_snapshot!(base64::encode(&pk_bincode)); + let expected = "qvgkBOX3v6c1LOCT5Kq+gkNThdZKqHAJClbRqjYWmAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH21zz6BGKHRL9pORR/hTW+FKDvE+OrKUQTF3tUHwjaCQJ4y7Cc0Y+Qgk+M41esYWMnb7xw31kKOFOtBW9K8W9mKwMMGFZGUxdw8a0YR+AcaR4oHwziNgXQOiYl9+HURiPWKgSC7x8pf72mezXiE73bnAQ+Ydwj1TiaXpObtvV73UFFQQXqHR1+dcom/BojKL4hyvKQwXEyjBip91w+Akrlxwv8NAaOL9VPRsgI/LJ+qWvbblaC1onIB9giUBNgnKk4P5juHAfkpVyW6kyQjufMFaegMpo9P47w84s4Bo4AtMizA3rcPw=="; + assert_eq!(base64::encode(&pk_bincode), expected); ServerPublicKey::load_from_bincode(&pk_bincode) .expect("Should load bincode"); @@ -600,7 +599,8 @@ mod tests { .serialize_to_bincode() .expect("Should serialize to bincode"); - assert_snapshot!(base64::encode(&proof_bincode)); + let expected = "BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcPDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw=="; + assert_eq!(base64::encode(&proof_bincode), expected); ProofDLEQ::load_from_bincode(&proof_bincode).expect("Should load bincode"); } diff --git a/ppoprf/src/snapshots/ppoprf__ppoprf__tests__pk_serialization.snap b/ppoprf/src/snapshots/ppoprf__ppoprf__tests__pk_serialization.snap deleted file mode 100644 index 8695c917..00000000 --- a/ppoprf/src/snapshots/ppoprf__ppoprf__tests__pk_serialization.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: ppoprf/src/ppoprf.rs -expression: "base64::encode(&pk_bincode)" ---- -qvgkBOX3v6c1LOCT5Kq+gkNThdZKqHAJClbRqjYWmAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH21zz6BGKHRL9pORR/hTW+FKDvE+OrKUQTF3tUHwjaCQJ4y7Cc0Y+Qgk+M41esYWMnb7xw31kKOFOtBW9K8W9mKwMMGFZGUxdw8a0YR+AcaR4oHwziNgXQOiYl9+HURiPWKgSC7x8pf72mezXiE73bnAQ+Ydwj1TiaXpObtvV73UFFQQXqHR1+dcom/BojKL4hyvKQwXEyjBip91w+Akrlxwv8NAaOL9VPRsgI/LJ+qWvbblaC1onIB9giUBNgnKk4P5juHAfkpVyW6kyQjufMFaegMpo9P47w84s4Bo4AtMizA3rcPw== diff --git a/ppoprf/src/snapshots/ppoprf__ppoprf__tests__proof_serialization.snap b/ppoprf/src/snapshots/ppoprf__ppoprf__tests__proof_serialization.snap deleted file mode 100644 index 000900fb..00000000 --- a/ppoprf/src/snapshots/ppoprf__ppoprf__tests__proof_serialization.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: ppoprf/src/ppoprf.rs -expression: "base64::encode(&proof_bincode)" ---- -BwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcHBwcPDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw==