Rename full_address to address

Author: kseo

codechain/subcommand/account_command.rs

@@ -112,10 +112,10 @@ fn import_raw(ap: &AccountProvider, network_id: NetworkId, raw_key: &str) -> Res
 
 fn remove(ap: &AccountProvider, address: &str) -> Result<(), String> {
     match PlatformAddress::from_str(address) {
-        Ok(full_address) => {
+        Ok(address) => {
             let password = prompt_password("Password: ");
-            match ap.remove_account(full_address.address, &password) {
-                Ok(_) => println!("{} is deleted", full_address),
+            match ap.remove_account(address.clone().into(), &password) {
+                Ok(_) => println!("{} is deleted", address),
                 Err(e) => return Err(format!("{:?}", e)),
             }
         }
@@ -134,10 +134,10 @@ fn list(ap: &AccountProvider, network_id: NetworkId) -> Result<(), String> {
 
 fn change_password(ap: &AccountProvider, address: &str) -> Result<(), String> {
     match PlatformAddress::from_str(address) {
-        Ok(full_address) => {
+        Ok(address) => {
             let old_password = prompt_password("Old Password: ");
             if let Some(new_password) = read_password_and_confirm() {
-                match ap.change_password(full_address.address, &old_password, &new_password) {
+                match ap.change_password(address.into(), &old_password, &new_password) {
                     Ok(_) => println!("Password has changed"),
                     Err(e) => return Err(format!("{:?}", e)),
                 }

rpc/src/v1/impls/account.rs

@@ -62,33 +62,19 @@ impl Account for AccountClient {
             .map_err(account_provider)
     }
 
-    fn remove_account(&self, full_address: PlatformAddress, passphrase: Option<Password>) -> Result<()> {
-        self.account_provider
-            .remove_account(full_address.address, &passphrase.unwrap_or_default())
-            .map_err(account_provider)
+    fn remove_account(&self, address: PlatformAddress, passphrase: Option<Password>) -> Result<()> {
+        self.account_provider.remove_account(address.into(), &passphrase.unwrap_or_default()).map_err(account_provider)
     }
 
-    fn sign(
-        &self,
-        message_digest: H256,
-        full_address: PlatformAddress,
-        passphrase: Option<Password>,
-    ) -> Result<Signature> {
+    fn sign(&self, message_digest: H256, address: PlatformAddress, passphrase: Option<Password>) -> Result<Signature> {
         self.account_provider
-            .sign(full_address.address, Some(passphrase.unwrap_or_default()), message_digest)
+            .sign(address.into(), Some(passphrase.unwrap_or_default()), message_digest)
             .map(|sig| sig.into())
             .map_err(account_provider)
     }
 
-    fn change_password(
-        &self,
-        full_address: PlatformAddress,
-        old_password: Password,
-        new_password: Password,
-    ) -> Result<()> {
-        self.account_provider
-            .change_password(full_address.address, &old_password, &new_password)
-            .map_err(account_provider)
+    fn change_password(&self, address: PlatformAddress, old_password: Password, new_password: Password) -> Result<()> {
+        self.account_provider.change_password(address.into(), &old_password, &new_password).map_err(account_provider)
     }
 
     fn unlock(&self, address: PlatformAddress, password: Password, duration: Option<u64>) -> Result<()> {