Rename ChangeShardOwners/Users to SetShardOwners/Users

Seulgi Kim · sgkim126 · commit 2f26d5a121fd · 2018-08-16T17:21:05.000+09:00
diff --git a/rpc/src/v1/types/action.rs b/rpc/src/v1/types/action.rs
@@ -47,11 +47,11 @@ pub enum Action {
         key: Public,
     },
     CreateShard,
-    ChangeShardOwners {
+    SetShardOwners {
         shard_id: ShardId,
         owners: Vec<PlatformAddress>,
     },
-    ChangeShardUsers {
+    SetShardUsers {
         shard_id: ShardId,
         users: Vec<PlatformAddress>,
     },
@@ -94,17 +94,17 @@ impl Action {
                 key,
             },
             ActionType::CreateShard => Action::CreateShard,
-            ActionType::ChangeShardOwners {
+            ActionType::SetShardOwners {
                 shard_id,
                 owners,
-            } => Action::ChangeShardOwners {
+            } => Action::SetShardOwners {
                 shard_id,
                 owners: owners.into_iter().map(|owner| PlatformAddress::create(VERSION, network_id, owner)).collect(),
             },
-            ActionType::ChangeShardUsers {
+            ActionType::SetShardUsers {
                 shard_id,
                 users,
-            } => Action::ChangeShardUsers {
+            } => Action::SetShardUsers {
                 shard_id,
                 users: users.into_iter().map(|user| PlatformAddress::create(VERSION, network_id, user)).collect(),
             },
@@ -148,17 +148,17 @@ impl From<Action> for ActionType {
                 key,
             },
             Action::CreateShard => ActionType::CreateShard,
-            Action::ChangeShardOwners {
+            Action::SetShardOwners {
                 shard_id,
                 owners,
-            } => ActionType::ChangeShardOwners {
+            } => ActionType::SetShardOwners {
                 shard_id,
                 owners: owners.into_iter().map(Into::into).collect(),
             },
-            Action::ChangeShardUsers {
+            Action::SetShardUsers {
                 shard_id,
                 users,
-            } => ActionType::ChangeShardUsers {
+            } => ActionType::SetShardUsers {
                 shard_id,
                 users: users.into_iter().map(Into::into).collect(),
             },
diff --git a/spec/JSON-RPC.md b/spec/JSON-RPC.md
@@ -69,15 +69,15 @@ A base32 string that starts with "ccc" or "tcc". See [the specification](https:/
  - action: "setRegularKey"
  - key: `H512`
 
-### ChangeShardOwners Action
+### SetShardOwners Action
 
- - action: "changeShardOwners"
+ - action: "setShardOwners"
  - shard_id: `number`
  - owners: `PlatformAddress[]`
 
-### ChangeShardUsers Action
+### SetShardUsers Action
 
- - action: "changeShardUsers"
+ - action: "setShardUsers"
  - shard_id: `number`
  - users: `PlatformAddress[]`
 
diff --git a/state/src/impls/top_level.rs b/state/src/impls/top_level.rs
@@ -469,14 +469,14 @@ impl TopLevelState {
                 self.create_shard(&shard_creation_cost, fee_payer)?;
                 Ok(ParcelInvoice::SingleSuccess)
             }
-            Action::ChangeShardOwners {
+            Action::SetShardOwners {
                 shard_id,
                 owners,
             } => {
                 self.change_shard_owners(*shard_id, owners, fee_payer)?;
                 Ok(ParcelInvoice::SingleSuccess)
             }
-            Action::ChangeShardUsers {
+            Action::SetShardUsers {
                 shard_id,
                 users,
             } => {
@@ -2431,7 +2431,7 @@ mod tests_parcel {
     }
 
     #[test]
-    fn change_shard_owners() {
+    fn set_shard_owners() {
         let (sender, sender_public) = address();
 
         let mut state = get_temp_state();
@@ -2445,7 +2445,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardOwners {
+            action: Action::SetShardOwners {
                 shard_id,
                 owners: owners.clone(),
             },
@@ -2491,7 +2491,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardOwners {
+            action: Action::SetShardOwners {
                 shard_id,
                 owners,
             },
@@ -2509,7 +2509,7 @@ mod tests_parcel {
     }
 
     #[test]
-    fn only_owner_can_change_owners() {
+    fn only_owner_can_set_owners() {
         let (original_owner, _) = address();
 
         let mut state = get_temp_state();
@@ -2539,7 +2539,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardOwners {
+            action: Action::SetShardOwners {
                 shard_id,
                 owners,
             },
@@ -2557,7 +2557,7 @@ mod tests_parcel {
     }
 
     #[test]
-    fn change_shard_owners_fail_on_invalid_shard_id() {
+    fn set_shard_owners_fail_on_invalid_shard_id() {
         let (sender, sender_public) = address();
 
         let mut state = get_temp_state();
@@ -2573,7 +2573,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardOwners {
+            action: Action::SetShardOwners {
                 shard_id,
                 owners: owners.clone(),
             },
@@ -2593,7 +2593,7 @@ mod tests_parcel {
     }
 
     #[test]
-    fn user_cannot_change_owners() {
+    fn user_cannot_set_owners() {
         let (original_owner, _) = address();
         let (sender, sender_public) = address();
 
@@ -2623,7 +2623,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardOwners {
+            action: Action::SetShardOwners {
                 shard_id,
                 owners,
             },
@@ -2717,7 +2717,7 @@ mod tests_parcel {
     }
 
     #[test]
-    fn change_shard_users() {
+    fn set_shard_users() {
         let network_id = "a2".into();
         let shard_id = 0;
 
@@ -2736,7 +2736,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardUsers {
+            action: Action::SetShardUsers {
                 shard_id,
                 users: new_users.clone(),
             },
@@ -2754,7 +2754,7 @@ mod tests_parcel {
 
 
     #[test]
-    fn user_cannot_change_shard_users() {
+    fn user_cannot_set_shard_users() {
         let network_id = "a2".into();
         let shard_id = 0;
 
@@ -2774,7 +2774,7 @@ mod tests_parcel {
 
         let parcel = Parcel {
             fee: 5.into(),
-            action: Action::ChangeShardUsers {
+            action: Action::SetShardUsers {
                 shard_id,
                 users: new_users.clone(),
             },
diff --git a/types/src/parcel/action.rs b/types/src/parcel/action.rs
@@ -26,8 +26,8 @@ const CHANGE_SHARD_STATE: u8 = 1;
 const PAYMENT: u8 = 2;
 const SET_REGULAR_KEY: u8 = 3;
 const CREATE_SHARD: u8 = 4;
-const CHANGE_SHARD_OWNERS: u8 = 5;
-const CHANGE_SHARD_USERS: u8 = 6;
+const SET_SHARD_OWNERS: u8 = 5;
+const SET_SHARD_USERS: u8 = 6;
 const CUSTOM: u8 = 0xFF;
 
 #[derive(Debug, Clone, PartialEq, Eq, RlpDecodable, RlpEncodable)]
@@ -54,11 +54,11 @@ pub enum Action {
         key: Public,
     },
     CreateShard,
-    ChangeShardOwners {
+    SetShardOwners {
         shard_id: ShardId,
         owners: Vec<Address>,
     },
-    ChangeShardUsers {
+    SetShardUsers {
         shard_id: ShardId,
         users: Vec<Address>,
     },
@@ -106,21 +106,21 @@ impl Encodable for Action {
                 s.begin_list(1);
                 s.append(&CREATE_SHARD);
             }
-            Action::ChangeShardOwners {
+            Action::SetShardOwners {
                 shard_id,
                 owners,
             } => {
                 s.begin_list(3);
-                s.append(&CHANGE_SHARD_OWNERS);
+                s.append(&SET_SHARD_OWNERS);
                 s.append(shard_id);
                 s.append_list(owners);
             }
-            Action::ChangeShardUsers {
+            Action::SetShardUsers {
                 shard_id,
                 users,
             } => {
                 s.begin_list(3);
-                s.append(&CHANGE_SHARD_USERS);
+                s.append(&SET_SHARD_USERS);
                 s.append(shard_id);
                 s.append_list(users);
             }
@@ -169,20 +169,20 @@ impl Decodable for Action {
                 }
                 Ok(Action::CreateShard)
             }
-            CHANGE_SHARD_OWNERS => {
+            SET_SHARD_OWNERS => {
                 if rlp.item_count()? != 3 {
                     return Err(DecoderError::RlpIncorrectListLen)
                 }
-                Ok(Action::ChangeShardOwners {
+                Ok(Action::SetShardOwners {
                     shard_id: rlp.val_at(1)?,
                     owners: rlp.list_at(2)?,
                 })
             }
-            CHANGE_SHARD_USERS => {
+            SET_SHARD_USERS => {
                 if rlp.item_count()? != 3 {
                     return Err(DecoderError::RlpIncorrectListLen)
                 }
-                Ok(Action::ChangeShardUsers {
+                Ok(Action::SetShardUsers {
                     shard_id: rlp.val_at(1)?,
                     users: rlp.list_at(2)?,
                 })
@@ -203,16 +203,16 @@ mod tests {
     use super::*;
 
     #[test]
-    fn encode_and_decode_change_shard_owners() {
-        rlp_encode_and_decode_test!(Action::ChangeShardOwners {
+    fn encode_and_decode_set_shard_owners() {
+        rlp_encode_and_decode_test!(Action::SetShardOwners {
             shard_id: 1,
             owners: vec![Address::random(), Address::random()],
         });
     }
 
     #[test]
-    fn encode_and_decode_change_shard_users() {
-        rlp_encode_and_decode_test!(Action::ChangeShardUsers {
+    fn encode_and_decode_set_shard_users() {
+        rlp_encode_and_decode_test!(Action::SetShardUsers {
             shard_id: 1,
             users: vec![Address::random(), Address::random()],
         });
