[aptos-cli] Support profiles in NamedAddresses

IDxtc · Apr 27, 2022 · 980c7e6 · 980c7e6
1 parent e12be41
commit 980c7e6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/crates/aptos/src/common/types.rs b/crates/aptos/src/common/types.rs
@@ -458,7 +458,17 @@ pub struct MovePackageDir {
     ///
     /// Note: This will fail if there are duplicates in the Move.toml file remove those first.
     #[clap(long, parse(try_from_str = parse_map), default_value = "")]
-    pub named_addresses: BTreeMap<String, AccountAddress>,
+    named_addresses: BTreeMap<String, AccountAddressWrapper>,
+}
+
+impl MovePackageDir {
+    pub fn named_addresses(&self) -> BTreeMap<String, AccountAddress> {
+        self.named_addresses
+            .clone()
+            .into_iter()
+            .map(|(key, value)| (key, value.account_address))
+            .collect()
+    }
 }
 
 const PARSE_MAP_SYNTAX_MSG: &str = "Invalid syntax for map.  Example: Name=Value,Name2=Value";
@@ -494,6 +504,21 @@ where
     Ok(map)
 }
 
+#[derive(Clone, Copy, Debug)]
+pub struct AccountAddressWrapper {
+    pub account_address: AccountAddress,
+}
+
+impl FromStr for AccountAddressWrapper {
+    type Err = CliError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(AccountAddressWrapper {
+            account_address: load_account_arg(s)?,
+        })
+    }
+}
+
 /// Loads an account arg and allows for naming based on profiles
 pub fn load_account_arg(str: &str) -> Result<AccountAddress, CliError> {
     if str.starts_with("0x") {

diff --git a/crates/aptos/src/move_tool/mod.rs b/crates/aptos/src/move_tool/mod.rs
@@ -69,7 +69,7 @@ pub struct CompilePackage {
 impl CompilePackage {
     pub async fn execute(self) -> CliTypedResult<Vec<String>> {
         let build_config = BuildConfig {
-            additional_named_addresses: self.move_options.named_addresses.clone(),
+            additional_named_addresses: self.move_options.named_addresses(),
             generate_docs: true,
             install_dir: self.move_options.output_dir.clone(),
             ..Default::default()
@@ -95,7 +95,7 @@ pub struct TestPackage {
 impl TestPackage {
     pub async fn execute(self) -> CliTypedResult<&'static str> {
         let config = BuildConfig {
-            additional_named_addresses: self.move_options.named_addresses.clone(),
+            additional_named_addresses: self.move_options.named_addresses(),
             test_mode: true,
             install_dir: self.move_options.output_dir.clone(),
             ..Default::default()
@@ -141,7 +141,7 @@ pub struct PublishPackage {
 impl PublishPackage {
     pub async fn execute(self) -> CliTypedResult<aptos_rest_client::Transaction> {
         let build_config = BuildConfig {
-            additional_named_addresses: self.move_options.named_addresses.clone(),
+            additional_named_addresses: self.move_options.named_addresses(),
             generate_abis: false,
             generate_docs: true,
             install_dir: self.move_options.output_dir.clone(),