Rename maximumExtraDataSize to maxExtraDataSize

Author: kseo

core/res/null.json

@@ -6,7 +6,7 @@
     }
   },
   "params": {
-    "maximumExtraDataSize": "0x20",
+    "maxExtraDataSize": "0x20",
     "networkID": "0x11",
     "minParcelCost": "10"
   },

core/res/solo.json

@@ -7,7 +7,7 @@
 		}
 	},
 	"params": {
-		"maximumExtraDataSize": "0x20",
+		"maxExtraDataSize": "0x20",
 		"networkID": "0x11",
 		"minParcelCost": "10"
 	},

core/res/solo_authority.json

@@ -11,7 +11,7 @@
 		}
 	},
 	"params": {
-		"maximumExtraDataSize": "0x20",
+		"maxExtraDataSize": "0x20",
 		"networkID": "0x11",
 		"minParcelCost": "10"
 	},

core/res/tendermint.json

@@ -17,7 +17,7 @@
 		}
 	},
 	"params": {
-		"maximumExtraDataSize": "0x20",
+		"maxExtraDataSize": "0x20",
 		"networkID": "0x11",
 		"minParcelCost": "10"
 	},

core/src/codechain_machine.rs

@@ -43,8 +43,8 @@ impl CodeChainMachine {
     }
 
     /// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
-    pub fn maximum_extra_data_size(&self) -> usize {
-        self.params().maximum_extra_data_size
+    pub fn max_extra_data_size(&self) -> usize {
+        self.params().max_extra_data_size
     }
 
     /// Does basic verification of the parcel.

core/src/consensus/mod.rs

@@ -286,8 +286,8 @@ pub trait CodeChainEngine: ConsensusEngine<CodeChainMachine> {
     }
 
     /// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
-    fn maximum_extra_data_size(&self) -> usize {
-        self.machine().maximum_extra_data_size()
+    fn max_extra_data_size(&self) -> usize {
+        self.machine().max_extra_data_size()
     }
 
     /// Additional verification for parcels in blocks.

core/src/spec/spec.rs

@@ -38,7 +38,7 @@ use super::Genesis;
 #[derive(Debug, PartialEq, Default)]
 pub struct CommonParams {
     /// Maximum size of extra data.
-    pub maximum_extra_data_size: usize,
+    pub max_extra_data_size: usize,
     /// Network id.
     pub network_id: u64,
     /// Minimum parcel cost.
@@ -48,7 +48,7 @@ pub struct CommonParams {
 impl From<cjson::spec::Params> for CommonParams {
     fn from(p: cjson::spec::Params) -> Self {
         Self {
-            maximum_extra_data_size: p.maximum_extra_data_size.into(),
+            max_extra_data_size: p.max_extra_data_size.into(),
             network_id: p.network_id.into(),
             min_parcel_cost: p.min_parcel_cost.into(),
         }

core/src/verification/verification.rs

@@ -75,11 +75,11 @@ pub fn verify_header_params(header: &Header, engine: &CodeChainEngine) -> Result
             found: header.number(),
         })))
     }
-    let maximum_extra_data_size = engine.maximum_extra_data_size();
-    if header.number() != 0 && header.extra_data().len() > maximum_extra_data_size {
+    let max_extra_data_size = engine.max_extra_data_size();
+    if header.number() != 0 && header.extra_data().len() > max_extra_data_size {
         return Err(From::from(BlockError::ExtraDataOutOfBounds(OutOfBounds {
             min: None,
-            max: Some(maximum_extra_data_size),
+            max: Some(max_extra_data_size),
             found: header.extra_data().len(),
         })))
     }

json/src/spec/params.rs

@@ -20,8 +20,8 @@ use super::super::uint::Uint;
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct Params {
     /// Maximum size of extra data.
-    #[serde(rename = "maximumExtraDataSize")]
-    pub maximum_extra_data_size: Uint,
+    #[serde(rename = "maxExtraDataSize")]
+    pub max_extra_data_size: Uint,
     /// Network id.
     #[serde(rename = "networkID")]
     pub network_id: Uint,
@@ -41,13 +41,13 @@ mod tests {
     #[test]
     fn params_deserialization() {
         let s = r#"{
-			"maximumExtraDataSize": "0x20",
+			"maxExtraDataSize": "0x20",
 			"networkID" : "0x1",
 			"minParcelCost" : "10"
 		}"#;
 
         let deserialized: Params = serde_json::from_str(s).unwrap();
-        assert_eq!(deserialized.maximum_extra_data_size, Uint(U256::from(0x20)));
+        assert_eq!(deserialized.max_extra_data_size, Uint(U256::from(0x20)));
         assert_eq!(deserialized.network_id, Uint(U256::from(0x1)));
         assert_eq!(deserialized.min_parcel_cost, Uint(U256::from(10)));
     }

json/src/spec/spec.rs

@@ -73,7 +73,7 @@ mod tests {
 		}
 	},
 	"params": {
-		"maximumExtraDataSize": "0x20",
+		"maxExtraDataSize": "0x20",
 		"networkID" : "0x2",
 		"minParcelCost" : "10"
 	},