Reduce the size of network_id to u32

Author: Seulgi Kim

codechain/constants.rs

@@ -16,4 +16,4 @@
 
 pub const DEFAULT_CONFIG_PATH: &'static str = "codechain/config/presets/config.dev.toml";
 pub const DEFAULT_KEYS_PATH: &'static str = "keys";
-pub const DEFAULT_NETWORK_ID: u64 = 0x11;
+pub const DEFAULT_NETWORK_ID: u32 = 0x11;

core/src/client/test_client.rs

@@ -198,7 +198,7 @@ impl TestBlockChainClient {
                 let parcel = Parcel {
                     nonce: U256::zero(),
                     fee: U256::from(10),
-                    network_id: 0u64,
+                    network_id: 0,
                     action: Action::ChangeShardState {
                         transactions: vec![],
                         changes: vec![],
@@ -266,7 +266,7 @@ impl TestBlockChainClient {
         let parcel = Parcel {
             nonce: U256::zero(),
             fee: U256::from(10),
-            network_id: 0u64,
+            network_id: 0,
             action: Action::ChangeShardState {
                 transactions,
                 changes: vec![],

core/src/miner/local_parcels.rs

@@ -222,7 +222,7 @@ mod tests {
                 changes: vec![],
                 signatures: vec![],
             },
-            network_id: 0u64,
+            network_id: 0,
         };
         SignedParcel::new_with_sign(parcel, keypair.private())
     }

core/src/spec/spec.rs

@@ -49,7 +49,7 @@ pub struct CommonParams {
     /// Maximum size of metadata.
     pub max_metadata_size: usize,
     /// Network id.
-    pub network_id: u64,
+    pub network_id: u32,
     /// Minimum parcel cost.
     pub min_parcel_cost: U256,
     /// Maximum size of block body.
@@ -62,10 +62,11 @@ pub struct CommonParams {
 
 impl From<cjson::spec::Params> for CommonParams {
     fn from(p: cjson::spec::Params) -> Self {
+        let network_id: u64 = p.network_id.into();
         Self {
             max_extra_data_size: p.max_extra_data_size.into(),
             max_metadata_size: p.max_metadata_size.into(),
-            network_id: p.network_id.into(),
+            network_id: network_id as u32,
             min_parcel_cost: p.min_parcel_cost.into(),
             max_body_size: p.max_body_size.into(),
             snapshot_period: p.snapshot_period.into(),

docs/parcel.rst

@@ -28,7 +28,7 @@ A parcel would look something like this:
     pub struct Parcel {
         pub nonce: U256,
         pub fee: U256,
-        pub network_id: u64,
+        pub network_id: u32,
         pub action: Action,
     }
 
@@ -46,4 +46,4 @@ A parcel would look something like this:
     }
 
 The fee of the parcel would determine its priority, meaning, how quickly it gets processed. In addition, there is
-also a minimum fee that can be set. The nonce property exists for the purpose of preventing replay attacks.
+also a minimum fee that can be set. The nonce property exists for the purpose of preventing replay attacks.

key/src/address.rs

@@ -168,7 +168,7 @@ pub struct FullAddress {
 }
 
 impl FullAddress {
-    pub fn create_version0(network_id: u64, address: Address) -> Result<Self, Error> {
+    pub fn create_version0(network_id: u32, address: Address) -> Result<Self, Error> {
         let network = match network_id {
             // FIXME: 0x11 is the network id for SOLO
             0x11 => Network::Mainnet,

rpc/src/v1/impls/account.rs

@@ -26,11 +26,11 @@ use super::super::traits::Account;
 
 pub struct AccountClient {
     account_provider: Arc<AccountProvider>,
-    network_id: u64,
+    network_id: u32,
 }
 
 impl AccountClient {
-    pub fn new(ap: &Arc<AccountProvider>, network_id: u64) -> Self {
+    pub fn new(ap: &Arc<AccountProvider>, network_id: u32) -> Self {
         AccountClient {
             account_provider: ap.clone(),
             network_id,

rpc/src/v1/impls/chain.rs

@@ -192,7 +192,7 @@ where
         }
     }
 
-    fn get_network_id(&self) -> Result<u64> {
+    fn get_network_id(&self) -> Result<u32> {
         Ok(self.client.common_params().network_id)
     }
 

rpc/src/v1/traits/chain.rs

@@ -114,7 +114,7 @@ build_rpc_trait! {
 
         /// Return the network id that is used in this chain.
         # [rpc(name = "chain_getNetworkId")]
-        fn get_network_id(&self) -> Result<u64>;
+        fn get_network_id(&self) -> Result<u32>;
 
         /// Execute Transactions
         # [rpc(name = "chain_executeTransactions")]

rpc/src/v1/types/parcel.rs

@@ -27,7 +27,7 @@ pub struct Parcel {
     pub parcel_index: Option<usize>,
     pub nonce: U256,
     pub fee: U256,
-    pub network_id: u64,
+    pub network_id: u32,
     pub action: Action,
     pub hash: H256,
     pub sig: Signature,