Skip to content

Commit c65a811

Browse files
committed
Use CanonJsonSerialize in tests
Signed-off-by: Etienne Champetier <[email protected]>
1 parent 728c62e commit c65a811

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

src/lib.rs

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ where
372372
where
373373
W: Write,
374374
{
375-
let mut ser = serde_json::Serializer::with_formatter(writer, CanonicalFormatter::new());
375+
let mut ser = Serializer::with_formatter(writer, CanonicalFormatter::new());
376376
Ok(self.serialize(&mut ser)?)
377377
}
378378

@@ -396,7 +396,7 @@ mod tests {
396396

397397
use proptest::prelude::*;
398398
use serde::Serialize;
399-
use serde_json::{Number, Serializer};
399+
use serde_json::Number;
400400
use sha2::{Digest, Sha256};
401401
use similar_asserts::assert_eq;
402402

@@ -427,10 +427,7 @@ mod tests {
427427
macro_rules! encode {
428428
($($tt:tt)+) => {
429429
(|v: serde_json::Value| -> Result<Vec<u8>> {
430-
let mut buf = Vec::new();
431-
let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
432-
v.serialize(&mut ser)?;
433-
Ok(buf)
430+
v.to_canon_json_vec()
434431
})(serde_json::json!($($tt)+))
435432
};
436433
}
@@ -538,10 +535,6 @@ mod tests {
538535
i128: i128::MIN,
539536
};
540537

541-
let mut buf = Vec::new();
542-
let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
543-
value.serialize(&mut ser).unwrap();
544-
545538
let expected = [
546539
123, 34, 105, 49, 50, 56, 34, 58, 45, 49, 55, 48, 49, 52, 49, 49, 56, 51, 52, 54, 48,
547540
52, 54, 57, 50, 51, 49, 55, 51, 49, 54, 56, 55, 51, 48, 51, 55, 49, 53, 56, 56, 52, 49,
@@ -550,7 +543,7 @@ mod tests {
550543
55, 54, 56, 50, 49, 49, 52, 53, 53, 125,
551544
];
552545

553-
assert_eq!(buf, expected);
546+
assert_eq!(value.to_canon_json_vec().unwrap(), expected);
554547
}
555548

556549
#[test]
@@ -597,11 +590,7 @@ mod tests {
597590

598591
fn verify(input: &str, expected: &str) {
599592
let input: serde_json::Value = serde_json::from_str(input).unwrap();
600-
let mut buf = Vec::new();
601-
let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
602-
input.serialize(&mut ser).unwrap();
603-
let buf = String::from_utf8(buf).unwrap();
604-
assert_eq!(expected, &buf);
593+
assert_eq!(expected, input.to_canon_json_string().unwrap());
605594
}
606595

607596
#[test]

0 commit comments

Comments
 (0)