Remove Address::{new, zero} and use Address::default() instead

Author: kseo

core/src/block.rs

@@ -423,7 +423,7 @@ pub fn enact(
     parent: &Header,
     is_epoch_begin: bool,
 ) -> Result<LockedBlock, Error> {
-    let mut b = OpenBlock::new(engine, db, parent, Address::new(), vec![], is_epoch_begin)?;
+    let mut b = OpenBlock::new(engine, db, parent, Address::default(), vec![], is_epoch_begin)?;
 
     b.populate_from(header);
     b.push_parcels(parcels)?;
@@ -444,7 +444,7 @@ mod tests {
         let spec = Spec::new_test();
         let genesis_header = spec.genesis_header();
         let db = spec.ensure_genesis_state(get_temp_state_db()).unwrap();
-        let b = OpenBlock::new(&*spec.engine, db, &genesis_header, Address::zero(), vec![], false).unwrap();
+        let b = OpenBlock::new(&*spec.engine, db, &genesis_header, Address::default(), vec![], false).unwrap();
         let parent_parcels_root = genesis_header.parcels_root().clone();
         let parent_invoices_root = genesis_header.invoices_root().clone();
         let b = b.close_and_lock(parent_parcels_root, parent_invoices_root);

core/src/miner/sealing_queue.rs

@@ -94,7 +94,7 @@ mod tests {
     #[test]
     fn should_not_find_when_pushed() {
         let mut q = SealingQueue::new(QUEUE_SIZE);
-        let b = create_closed_block(Address::zero());
+        let b = create_closed_block(Address::default());
         let h = b.hash();
 
         q.push(b);
@@ -105,7 +105,7 @@ mod tests {
     #[test]
     fn should_find_when_pushed_and_used() {
         let mut q = SealingQueue::new(QUEUE_SIZE);
-        let b = create_closed_block(Address::zero());
+        let b = create_closed_block(Address::default());
         let h = b.hash();
 
         q.push(b);

core/src/spec/genesis.rs

@@ -48,7 +48,7 @@ impl From<cjson::spec::Genesis> for Genesis {
         Genesis {
             seal: From::from(g.seal),
             score: g.score.into(),
-            author: g.author.map_or_else(Address::zero, Into::into),
+            author: g.author.map_or_else(Address::default, Into::into),
             timestamp: g.timestamp.map_or(0, Into::into),
             parent_hash: g.parent_hash.map_or_else(H256::zero, Into::into),
             parcels_root: g.parcels_root.map_or_else(|| BLAKE_NULL_RLP.clone(), Into::into),

key/src/address.rs

@@ -34,14 +34,6 @@ use super::{Error, Network};
 pub struct Address(H160);
 
 impl Address {
-    pub fn zero() -> Self {
-        Address(H160::zero())
-    }
-
-    pub fn new() -> Self {
-        Address(H160::new())
-    }
-
     pub fn random() -> Self {
         Address(H160::random())
     }

state/src/impls/top_level.rs

@@ -552,7 +552,7 @@ impl TopLevelState {
         ctrace!(STATE, "shard created({}, {:?})", shard_id, shard_root);
 
         self.set_shard_root(shard_id, &BLAKE_NULL_RLP, &shard_root)?;
-        self.set_shard_owner(shard_id, &Address::zero(), *fee_payer)?;
+        self.set_shard_owner(shard_id, &Address::default(), *fee_payer)?;
         Ok(())
     }
 
@@ -628,7 +628,7 @@ impl TopLevelState {
     }
 
     fn require_shard<'a>(&'a self, shard_id: ShardId) -> TrieResult<RefMut<'a, Shard>> {
-        let default = || Shard::new(BLAKE_NULL_RLP, Address::zero());
+        let default = || Shard::new(BLAKE_NULL_RLP, Address::default());
         let db = TrieFactory::readonly(self.db.as_hashdb(), &self.root)?;
         let shard_address = ShardAddress::new(shard_id);
         let from_db = || self.db.get_cached_shard(&shard_address);
@@ -822,7 +822,7 @@ mod tests_state {
 
     #[test]
     fn should_work_when_cloned() {
-        let a = Address::zero();
+        let a = Address::default();
 
         let mut state = {
             let mut state = get_temp_state();
@@ -855,7 +855,7 @@ mod tests_state {
 
     #[test]
     fn get_from_database() {
-        let a = Address::zero();
+        let a = Address::default();
         let (root, db) = {
             let mut state = get_temp_state();
             assert_eq!(Ok(()), state.inc_nonce(&a));
@@ -872,7 +872,7 @@ mod tests_state {
 
     #[test]
     fn remove() {
-        let a = Address::zero();
+        let a = Address::default();
         let mut state = get_temp_state();
         assert_eq!(Ok(false), state.account_exists(&a));
         assert_eq!(Ok(false), state.account_exists_and_not_null(&a));
@@ -888,7 +888,7 @@ mod tests_state {
 
     #[test]
     fn empty_account_is_not_created() {
-        let a = Address::zero();
+        let a = Address::default();
         let db = get_temp_state_db();
         let (root, db) = {
             let mut state = TopLevelState::new(db);
@@ -903,7 +903,7 @@ mod tests_state {
 
     #[test]
     fn remove_from_database() {
-        let a = Address::zero();
+        let a = Address::default();
         let (root, db) = {
             let mut state = get_temp_state();
             assert_eq!(Ok(()), state.inc_nonce(&a));
@@ -932,7 +932,7 @@ mod tests_state {
     #[test]
     fn alter_balance() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         let b = 1u64.into();
         assert_eq!(Ok(()), state.add_balance(&a, &U256::from(69u64)));
         assert_eq!(Ok(69.into()), state.balance(&a));
@@ -953,7 +953,7 @@ mod tests_state {
     #[test]
     fn alter_nonce() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         assert_eq!(Ok(()), state.inc_nonce(&a));
         assert_eq!(Ok(1.into()), state.nonce(&a));
         assert_eq!(Ok(()), state.inc_nonce(&a));
@@ -969,7 +969,7 @@ mod tests_state {
     #[test]
     fn balance_nonce() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         assert_eq!(Ok(0.into()), state.balance(&a));
         assert_eq!(Ok(0.into()), state.nonce(&a));
         assert_eq!(Ok(()), state.commit());
@@ -980,7 +980,7 @@ mod tests_state {
     #[test]
     fn ensure_cached() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         state.require_account(&a).unwrap();
         assert_eq!(Ok(()), state.commit());
         assert_eq!(*state.root(), "db4046bb91a12a37cbfb0f09631aad96a97248423163eca791e19b430cc7fe4a".into());
@@ -989,7 +989,7 @@ mod tests_state {
     #[test]
     fn checkpoint_basic() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         state.create_checkpoint(0);
         assert_eq!(Ok(()), state.add_balance(&a, &U256::from(69u64)));
         assert_eq!(Ok(69.into()), state.balance(&a));
@@ -1005,7 +1005,7 @@ mod tests_state {
     #[test]
     fn checkpoint_nested() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         state.create_checkpoint(0);
         assert_eq!(Ok(()), state.add_balance(&a, &U256::from(69u64)));
         state.create_checkpoint(1);
@@ -1020,7 +1020,7 @@ mod tests_state {
     #[test]
     fn checkpoint_discard() {
         let mut state = get_temp_state();
-        let a = Address::zero();
+        let a = Address::default();
         state.create_checkpoint(0);
         assert_eq!(Ok(()), state.add_balance(&a, &U256::from(69u64)));
         state.create_checkpoint(1);