Serialize u128 and i128 as numbers

Author: chipshort

src/ser/mod.rs

@@ -194,11 +194,7 @@ impl<'a> ser::Serializer for &'a mut Serializer {
 
     fn serialize_i128(self, v: i128) -> Result<Self::Ok> {
         // -170141183460469231731687303715884105728
-        self.buf.push(b'"');
-        let res: Result<Self::Ok> = serialize_signed!(self, 40, v, i128, u128);
-        res?;
-        self.buf.push(b'"');
-        Ok(())
+        serialize_signed!(self, 40, v, i128, u128)
     }
 
     fn serialize_u8(self, v: u8) -> Result<Self::Ok> {
@@ -223,11 +219,7 @@ impl<'a> ser::Serializer for &'a mut Serializer {
 
     fn serialize_u128(self, v: u128) -> Result<Self::Ok> {
         // 340282366920938463463374607431768211455
-        self.buf.push(b'"');
-        let res: Result<Self::Ok> = serialize_unsigned!(self, 39, v);
-        res?;
-        self.buf.push(b'"');
-        Ok(())
+        serialize_unsigned!(self, 39, v)
     }
 
     fn serialize_f32(self, _v: f32) -> Result<Self::Ok> {
@@ -632,66 +624,64 @@ mod tests {
             "-9223372036854775808"
         );
 
-        assert_eq!(to_string::<u128>(&0).unwrap(), r#""0""#);
-        assert_eq!(to_string::<u128>(&1).unwrap(), r#""1""#);
-        assert_eq!(to_string::<u128>(&456789).unwrap(), r#""456789""#);
-        assert_eq!(to_string::<u128>(&4294967295).unwrap(), r#""4294967295""#);
-        assert_eq!(to_string::<u128>(&4294967296).unwrap(), r#""4294967296""#);
+        assert_eq!(to_string::<u128>(&0).unwrap(), r#"0"#);
+        assert_eq!(to_string::<u128>(&1).unwrap(), r#"1"#);
+        assert_eq!(to_string::<u128>(&456789).unwrap(), r#"456789"#);
+        assert_eq!(to_string::<u128>(&4294967295).unwrap(), r#"4294967295"#);
+        assert_eq!(to_string::<u128>(&4294967296).unwrap(), r#"4294967296"#);
         assert_eq!(
             to_string::<u128>(&9007199254740991).unwrap(),
-            r#""9007199254740991""#
+            r#"9007199254740991"#
         ); // Number.MAX_SAFE_INTEGER
         assert_eq!(
             to_string::<u128>(&9007199254740992).unwrap(),
-            r#""9007199254740992""#
+            r#"9007199254740992"#
         ); // Number.MAX_SAFE_INTEGER+1
         assert_eq!(
             to_string::<u128>(&9223372036854775807).unwrap(),
-            r#""9223372036854775807""#
+            r#"9223372036854775807"#
         );
         assert_eq!(
             to_string::<u128>(&9223372036854775808).unwrap(),
-            r#""9223372036854775808""#
+            r#"9223372036854775808"#
         );
         assert_eq!(
             to_string::<u128>(&u128::MAX).unwrap(),
-            r#""340282366920938463463374607431768211455""#
+            r#"340282366920938463463374607431768211455"#
         );
-        // Currently failing, see https://github.com/CosmWasm/serde-json-wasm/issues/54
-        // assert_serde_json_serialize_eq!(&u128::MAX);
-
-        assert_eq!(to_string::<i128>(&0).unwrap(), r#""0""#);
-        assert_eq!(to_string::<i128>(&1).unwrap(), r#""1""#);
-        assert_eq!(to_string::<i128>(&456789).unwrap(), r#""456789""#);
-        assert_eq!(to_string::<i128>(&4294967295).unwrap(), r#""4294967295""#);
-        assert_eq!(to_string::<i128>(&4294967296).unwrap(), r#""4294967296""#);
+        assert_serde_json_serialize_eq!(&u128::MAX);
+
+        assert_eq!(to_string::<i128>(&0).unwrap(), r#"0"#);
+        assert_eq!(to_string::<i128>(&1).unwrap(), r#"1"#);
+        assert_eq!(to_string::<i128>(&456789).unwrap(), r#"456789"#);
+        assert_eq!(to_string::<i128>(&4294967295).unwrap(), r#"4294967295"#);
+        assert_eq!(to_string::<i128>(&4294967296).unwrap(), r#"4294967296"#);
         assert_eq!(
             to_string::<i128>(&9007199254740991).unwrap(),
-            r#""9007199254740991""#
+            r#"9007199254740991"#
         ); // Number.MAX_SAFE_INTEGER
         assert_eq!(
             to_string::<i128>(&9007199254740992).unwrap(),
-            r#""9007199254740992""#
+            r#"9007199254740992"#
         ); // Number.MAX_SAFE_INTEGER+1
         assert_eq!(
             to_string::<i128>(&9223372036854775807).unwrap(),
-            r#""9223372036854775807""#
+            r#"9223372036854775807"#
         );
         assert_eq!(
             to_string::<i128>(&9223372036854775808).unwrap(),
-            r#""9223372036854775808""#
+            r#"9223372036854775808"#
         );
         assert_eq!(
             to_string::<i128>(&i128::MAX).unwrap(),
-            r#""170141183460469231731687303715884105727""#
+            r#"170141183460469231731687303715884105727"#
         );
-        assert_eq!(to_string::<i128>(&-1).unwrap(), r#""-1""#);
+        assert_eq!(to_string::<i128>(&-1).unwrap(), r#"-1"#);
         assert_eq!(
             to_string::<i128>(&i128::MIN).unwrap(),
-            r#""-170141183460469231731687303715884105728""#
+            r#"-170141183460469231731687303715884105728"#
         );
-        // Currently failing, see https://github.com/CosmWasm/serde-json-wasm/issues/54
-        // assert_serde_json_serialize_eq!(&i128::MIN);
+        assert_serde_json_serialize_eq!(&i128::MIN);
     }
 
     #[test]
@@ -725,10 +715,9 @@ mod tests {
 
         assert_eq!(
             to_string(&pair).unwrap(),
-            r#"["340282366920938463463374607431768211455","340282366920938463463374607431768211455"]"#
+            r#"[340282366920938463463374607431768211455,340282366920938463463374607431768211455]"#
         );
-        // Currently failing, see https://github.com/CosmWasm/serde-json-wasm/issues/54
-        // assert_serde_json_serialize_eq!(&pair);
+        assert_serde_json_serialize_eq!(&pair);
     }
 
     #[test]