Remove the types from tests

Rust compiler can infer those types.

Author: Seulgi Kim

json/src/scheme/account.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -34,11 +34,9 @@ impl Account {
 
 #[cfg(test)]
 mod tests {
-    use primitives::U256;
     use serde_json;
 
     use super::Account;
-    use crate::uint::Uint;
 
     #[test]
     fn account_deserialization() {
@@ -48,7 +46,7 @@ mod tests {
         }"#;
         let deserialized: Account = serde_json::from_str(s).unwrap();
         assert!(!deserialized.is_empty());
-        assert_eq!(deserialized.balance.unwrap(), Uint(U256::from(1)));
-        assert_eq!(deserialized.seq.unwrap(), Uint(U256::from(0)));
+        assert_eq!(deserialized.balance, Some(1.into()));
+        assert_eq!(deserialized.seq, Some(0.into()));
     }
 }

json/src/scheme/blake_pow.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -33,11 +33,9 @@ pub struct BlakePoW {
 
 #[cfg(test)]
 mod tests {
-    use primitives::U256;
     use serde_json;
 
     use super::*;
-    use crate::uint::Uint;
 
     #[test]
     fn blake_pow_deserialization() {
@@ -51,9 +49,9 @@ mod tests {
         }"#;
 
         let deserialized: BlakePoW = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
-        assert_eq!(deserialized.params.min_score, Some(Uint(U256::from(0x0002_0000))));
-        assert_eq!(deserialized.params.block_interval, Some(Uint(U256::from(120))));
-        assert_eq!(Some(Uint(15.into())), deserialized.params.recommended_confirmation);
+        assert_eq!(deserialized.params.block_reward, Some(0x0d.into()));
+        assert_eq!(deserialized.params.min_score, Some(0x0002_0000.into()));
+        assert_eq!(deserialized.params.block_interval, Some(120.into()));
+        assert_eq!(deserialized.params.recommended_confirmation, Some(15.into()));
     }
 }

json/src/scheme/cuckoo.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -36,11 +36,9 @@ pub struct Cuckoo {
 
 #[cfg(test)]
 mod tests {
-    use primitives::U256;
     use serde_json;
 
     use super::*;
-    use crate::uint::Uint;
 
     #[test]
     fn cuckoo_deserialization() {
@@ -57,12 +55,12 @@ mod tests {
         }"#;
 
         let deserialized: Cuckoo = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
-        assert_eq!(deserialized.params.block_interval, Some(Uint(U256::from(120))));
-        assert_eq!(deserialized.params.min_score, Some(Uint(U256::from(0x0002_0000))));
-        assert_eq!(deserialized.params.max_vertex, Some(Uint(U256::from(16))));
-        assert_eq!(deserialized.params.max_edge, Some(Uint(U256::from(8))));
-        assert_eq!(deserialized.params.cycle_length, Some(Uint(U256::from(6))));
-        assert_eq!(Some(Uint(6.into())), deserialized.params.recommended_confirmation);
+        assert_eq!(deserialized.params.block_reward, Some(0x0d.into()));
+        assert_eq!(deserialized.params.block_interval, Some(120.into()));
+        assert_eq!(deserialized.params.min_score, Some(0x0002_0000.into()));
+        assert_eq!(deserialized.params.max_vertex, Some(16.into()));
+        assert_eq!(deserialized.params.max_edge, Some(8.into()));
+        assert_eq!(deserialized.params.cycle_length, Some(6.into()));
+        assert_eq!(deserialized.params.recommended_confirmation, Some(6.into()));
     }
 }

json/src/scheme/genesis.rs

@@ -49,14 +49,13 @@ mod tests {
 
     use ckey::PlatformAddress;
 
-    use primitives::{H256 as Core256, H520 as Core520, U256};
+    use primitives::{H256 as Core256, H520 as Core520};
     use serde_json;
 
     use super::super::{Seal, TendermintSeal};
     use super::Genesis;
     use crate::bytes::Bytes;
     use crate::hash::{H256, H520};
-    use crate::uint::Uint;
 
     #[test]
     fn genesis_deserialization() {
@@ -80,15 +79,15 @@ mod tests {
         let deserialized: Genesis = serde_json::from_str(s).unwrap();
         assert_eq!(deserialized, Genesis {
             seal: Seal::Tendermint(TendermintSeal {
-                prev_view: Uint(U256::from(0x0)),
-                cur_view: Uint(U256::from(0x0)),
+                prev_view: 0x0.into(),
+                cur_view: 0x0.into(),
                 precommits: vec![
                     H520(Core520::from("0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")),
                 ]
             }),
-            score: Uint(U256::from(0x0004_0000_0000u64)),
+            score: 0x0004_0000_0000u64.into(),
             author: Some(PlatformAddress::from_str("tccqyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqhhn9p3").unwrap()),
-            timestamp: Some(Uint(U256::from(0x07))),
+            timestamp: Some(0x07.into()),
             parent_hash: Some(H256(Core256::from("0x9000000000000000000000000000000000000000000000000000000000000000"))),
             transactions_root: None,
             state_root: Some(H256(Core256::from("0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"))),

json/src/scheme/null_engine.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -32,11 +32,9 @@ pub struct NullEngine {
 
 #[cfg(test)]
 mod tests {
-    use primitives::U256;
     use serde_json;
 
     use super::*;
-    use crate::uint::Uint;
 
     #[test]
     fn null_engine_deserialization() {
@@ -47,6 +45,6 @@ mod tests {
         }"#;
 
         let deserialized: NullEngine = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
+        assert_eq!(deserialized.params.block_reward, Some(0x0d.into()));
     }
 }

json/src/scheme/params.rs

@@ -60,11 +60,9 @@ pub struct Params {
 
 #[cfg(test)]
 mod tests {
-    use primitives::U256;
     use serde_json;
 
     use super::Params;
-    use crate::uint::Uint;
 
     #[test]
     fn params_deserialization() {
@@ -95,28 +93,28 @@ mod tests {
         }"#;
 
         let deserialized: Params = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.max_extra_data_size, Uint(U256::from(0x20)));
-        assert_eq!(deserialized.max_asset_scheme_metadata_size, Uint(U256::from(0x0400)));
-        assert_eq!(deserialized.max_transfer_metadata_size, Uint(U256::from(0x0100)));
-        assert_eq!(deserialized.max_text_content_size, Uint(U256::from(0x0200)));
+        assert_eq!(deserialized.max_extra_data_size, 0x20.into());
+        assert_eq!(deserialized.max_asset_scheme_metadata_size, 0x0400.into());
+        assert_eq!(deserialized.max_transfer_metadata_size, 0x0100.into());
+        assert_eq!(deserialized.max_text_content_size, 0x0200.into());
         assert_eq!(deserialized.network_id, "tc".into());
-        assert_eq!(deserialized.min_pay_cost, Uint(10.into()));
-        assert_eq!(deserialized.min_set_regular_key_cost, Uint(11.into()));
-        assert_eq!(deserialized.min_create_shard_cost, Uint(12.into()));
-        assert_eq!(deserialized.min_set_shard_owners_cost, Uint(13.into()));
-        assert_eq!(deserialized.min_set_shard_users_cost, Uint(14.into()));
-        assert_eq!(deserialized.min_wrap_ccc_cost, Uint(15.into()));
-        assert_eq!(deserialized.min_custom_cost, Uint(16.into()));
-        assert_eq!(deserialized.min_store_cost, Uint(17.into()));
-        assert_eq!(deserialized.min_remove_cost, Uint(18.into()));
-        assert_eq!(deserialized.min_mint_asset_cost, Uint(19.into()));
-        assert_eq!(deserialized.min_transfer_asset_cost, Uint(20.into()));
-        assert_eq!(deserialized.min_change_asset_scheme_cost, Uint(21.into()));
-        assert_eq!(deserialized.min_compose_asset_cost, Uint(22.into()));
-        assert_eq!(deserialized.min_decompose_asset_cost, Uint(23.into()));
-        assert_eq!(deserialized.min_unwrap_ccc_cost, Uint(24.into()));
-        assert_eq!(deserialized.min_increase_asset_supply_cost, Uint(25.into()));
-        assert_eq!(deserialized.max_body_size, Uint(4_194_304.into()));
-        assert_eq!(deserialized.snapshot_period, Uint(16_384.into()));
+        assert_eq!(deserialized.min_pay_cost, 10.into());
+        assert_eq!(deserialized.min_set_regular_key_cost, 11.into());
+        assert_eq!(deserialized.min_create_shard_cost, 12.into());
+        assert_eq!(deserialized.min_set_shard_owners_cost, 13.into());
+        assert_eq!(deserialized.min_set_shard_users_cost, 14.into());
+        assert_eq!(deserialized.min_wrap_ccc_cost, 15.into());
+        assert_eq!(deserialized.min_custom_cost, 16.into());
+        assert_eq!(deserialized.min_store_cost, 17.into());
+        assert_eq!(deserialized.min_remove_cost, 18.into());
+        assert_eq!(deserialized.min_mint_asset_cost, 19.into());
+        assert_eq!(deserialized.min_transfer_asset_cost, 20.into());
+        assert_eq!(deserialized.min_change_asset_scheme_cost, 21.into());
+        assert_eq!(deserialized.min_compose_asset_cost, 22.into());
+        assert_eq!(deserialized.min_decompose_asset_cost, 23.into());
+        assert_eq!(deserialized.min_unwrap_ccc_cost, 24.into());
+        assert_eq!(deserialized.min_increase_asset_supply_cost, 25.into());
+        assert_eq!(deserialized.max_body_size, 4_194_304.into());
+        assert_eq!(deserialized.snapshot_period, 16_384.into());
     }
 }

json/src/scheme/seal.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -41,13 +41,12 @@ pub enum Seal {
 
 #[cfg(test)]
 mod tests {
-    use primitives::{H520 as Core520, U256};
+    use primitives::H520 as Core520;
     use serde_json;
 
     use super::{Seal, TendermintSeal};
     use crate::bytes::Bytes;
     use crate::hash::H520;
-    use crate::uint::Uint;
 
     #[test]
     fn seal_deserialization() {
@@ -64,22 +63,16 @@ mod tests {
         }]"#;
 
         let deserialized: Vec<Seal> = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.len(), 2);
-
-        // [0]
-        assert_eq!(
-            deserialized[0],
+        assert_eq!(deserialized, vec![
             Seal::Generic(Bytes::new(vec![
                 0xe0, 0x11, 0xbb, 0xe8, 0xdb, 0x4e, 0x34, 0x7b, 0x4e, 0x8c, 0x93, 0x7c, 0x1c, 0x83, 0x70, 0xe4, 0xb5,
                 0xed, 0x33, 0xad, 0xb3, 0xdb, 0x69, 0xcb, 0xdb, 0x7a, 0x38, 0xe1, 0xe5, 0x0b, 0x1b, 0x82, 0xfa,
-            ]))
-        );
-
-        // [1]
-        assert_eq!(deserialized[1], Seal::Tendermint(TendermintSeal {
-            prev_view: Uint(U256::from(0x3)),
-            cur_view: Uint(U256::from(0x4)),
-            precommits: vec![H520(Core520::from("0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"))]
-        }));
+            ])),
+            Seal::Tendermint(TendermintSeal {
+                prev_view: 0x3.into(),
+                cur_view: 0x4.into(),
+                precommits: vec![H520(Core520::from("0x4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004"))]
+            }),
+        ]);
     }
 }

json/src/scheme/shard.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -30,7 +30,6 @@ mod tests {
     use std::str::FromStr;
 
     use ckey::PlatformAddress;
-    use primitives::U256;
     use serde_json;
 
     use super::*;
@@ -44,7 +43,7 @@ mod tests {
         let shard: Shard = serde_json::from_str(s).unwrap();
         assert_eq!(
             Shard {
-                seq: Some(Uint(U256::from(0))),
+                seq: Some(0.into()),
                 owners: vec![PlatformAddress::from_str("tccq8vapdlstar6ghmqgczp6j2e83njsqq0tsvaxm9u").unwrap()],
                 users: None,
             },
@@ -62,7 +61,7 @@ mod tests {
         let shard: Shard = serde_json::from_str(s).unwrap();
         assert_eq!(
             Shard {
-                seq: Some(Uint(U256::from(100))),
+                seq: Some(100.into()),
                 owners: vec![PlatformAddress::from_str("tccq8vapdlstar6ghmqgczp6j2e83njsqq0tsvaxm9u").unwrap()],
                 users: Some(vec![PlatformAddress::from_str("tccq8txq9uafdg8y2de9m2tdkhsfsj3m9nluq94hyan").unwrap()]),
             },

json/src/scheme/simple_poa.rs

@@ -1,4 +1,4 @@
-// Copyright 2018 Kodebox, Inc.
+// Copyright 2018-2019 Kodebox, Inc.
 // This file is part of CodeChain.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -39,11 +39,9 @@ mod tests {
     use std::str::FromStr;
 
     use ckey::Public;
-    use primitives::U256;
     use serde_json;
 
     use super::SimplePoA;
-    use crate::uint::Uint;
 
     #[test]
     fn basic_authority_deserialization() {
@@ -58,6 +56,6 @@ mod tests {
 
         let vs = vec![Public::from_str("2a8a69439f2396c9a328289fdc3905d9736da9e14eb1a282cfd2c036cc21a17a5d05595160b7924e5ecf3f2628b440e601f3a531e92fa81571a70e6c695b2d08").unwrap()];
         assert_eq!(deserialized.params.validators, vs);
-        assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
+        assert_eq!(deserialized.params.block_reward, Some(0x0d.into()));
     }
 }

json/src/scheme/solo.rs

@@ -45,13 +45,9 @@ pub struct Solo {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashMap;
-
-    use primitives::U256;
     use serde_json;
 
     use super::Solo;
-    use crate::uint::Uint;
 
     #[test]
     fn basic_authority_deserialization() {
@@ -64,8 +60,8 @@ mod tests {
         }"#;
 
         let deserialized: Solo = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.params.block_reward, Some(Uint(U256::from(0x0d))));
-        assert_eq!(deserialized.params.action_handlers.hit, Some(HashMap::new()));
-        assert_eq!(deserialized.params.action_handlers.genesis_stakes, Some(HashMap::new()));
+        assert_eq!(deserialized.params.block_reward, Some(0x0d.into()));
+        assert_eq!(deserialized.params.action_handlers.hit, Some(Default::default()));
+        assert_eq!(deserialized.params.action_handlers.genesis_stakes, Some(Default::default()));
     }
 }