Address feedback

Author: jasonz-dfinity

rs/nns/governance/src/proposals/self_describing.rs

@@ -1,10 +1,11 @@
-use std::collections::HashMap;
-
 use crate::pb::v1::{
     ApproveGenesisKyc, Motion, SelfDescribingProposalAction, Value, ValueArray, ValueMap,
     value::Value::{Array, Map, Text},
 };
 
+use ic_base_types::PrincipalId;
+use std::collections::HashMap;
+
 /// A proposal action that can be described locally, without having to call `canister_metadata`
 /// management canister method to get the candid file of an external canister. Every proposal action
 /// except for `ExecuteNnsFunction` should implement this trait.
@@ -32,7 +33,7 @@ impl LocallyDescribableProposalAction for Motion {
 
     fn to_value(&self) -> Value {
         ValueBuilder::new()
-            .add_string_field("motion_text", self.motion_text.clone())
+            .add_field("motion_text", self.motion_text.clone())
             .build()
     }
 }
@@ -49,16 +50,11 @@ impl LocallyDescribableProposalAction for ApproveGenesisKyc {
 
     fn to_value(&self) -> Value {
         ValueBuilder::new()
-            .add_array_field(
-                "principals".to_string(),
-                self.principals
-                    .iter()
-                    .map(|principal| string_to_value(principal.to_string()))
-                    .collect(),
-            )
+            .add_array_field("principals", self.principals.clone())
             .build()
     }
 }
+
 /// A builder for `Value` objects.
 pub(crate) struct ValueBuilder {
     fields: HashMap<String, Value>,
@@ -71,20 +67,22 @@ impl ValueBuilder {
         }
     }
 
-    pub fn add_string_field(mut self, key: impl ToString, value: String) -> Self {
-        self.fields.insert(
-            key.to_string(),
-            Value {
-                value: Some(Text(value.to_string())),
-            },
-        );
+    pub fn add_field(mut self, key: impl ToString, value: impl Into<Value>) -> Self {
+        self.fields.insert(key.to_string(), value.into());
+        self
     }
 
-    pub fn add_array_field(mut self, key: impl ToString, values: Vec<Value>) -> Self {
+    pub fn add_array_field(
+        mut self,
+        key: impl ToString,
+        values: impl IntoIterator<Item = impl Into<Value>>,
+    ) -> Self {
         self.fields.insert(
-            key,
+            key.to_string(),
             Value {
-                value: Some(Array(ValueArray { values })),
+                value: Some(Array(ValueArray {
+                    values: values.into_iter().map(Into::into).collect(),
+                })),
             },
         );
         self
@@ -98,10 +96,19 @@ impl ValueBuilder {
     }
 }
 
-/// Converts a string to a `Value` object.
-fn string_to_value(value: String) -> Value {
-    Value {
-        value: Some(Text(value)),
+impl From<String> for Value {
+    fn from(value: String) -> Self {
+        Value {
+            value: Some(Text(value)),
+        }
+    }
+}
+
+impl From<PrincipalId> for Value {
+    fn from(value: PrincipalId) -> Self {
+        Value {
+            value: Some(Text(value.to_string())),
+        }
     }
 }