Make better API with Into<Value>

Signed-off-by: Daniil Polyakov <arjentix@gmail.com>

client/tests/integration/domain_owner.rs

@@ -21,7 +21,7 @@ fn domain_owner_domain_permissions() -> Result<()> {
     test_client.submit_blocking(SetKeyValueBox::domain(
         kingdom_id.clone(),
         key.clone(),
-        value.into(),
+        value,
     ))?;
     test_client.submit_blocking(RemoveKeyValueBox::domain(kingdom_id.clone(), key))?;
 
@@ -82,7 +82,7 @@ fn domain_owner_account_permissions() -> Result<()> {
     test_client.submit_blocking(SetKeyValueBox::account(
         mad_hatter_id.clone(),
         key.clone(),
-        value.into(),
+        value,
     ))?;
     test_client.submit_blocking(RemoveKeyValueBox::account(mad_hatter_id.clone(), key))?;
 
@@ -142,7 +142,7 @@ fn domain_owner_asset_definition_permissions() -> Result<()> {
     test_client.submit_blocking(SetKeyValueBox::asset_definition(
         coin_id.clone(),
         key.clone(),
-        value.into(),
+        value,
     ))?;
     test_client.submit_blocking(RemoveKeyValueBox::asset_definition(coin_id.clone(), key))?;
 
@@ -209,7 +209,7 @@ fn domain_owner_asset_permissions() -> Result<()> {
     test_client.submit_blocking(SetKeyValueBox::asset(
         bob_store_id.clone(),
         key.clone(),
-        value.into(),
+        value,
     ))?;
     test_client.submit_blocking(RemoveKeyValueBox::asset(bob_store_id.clone(), key))?;
 

client/tests/integration/permissions.rs

@@ -247,7 +247,7 @@ fn permissions_differ_not_only_by_names() {
         .submit_blocking(SetKeyValueBox::asset(
             mouse_hat_id,
             Name::from_str("color").expect("Valid"),
-            "red".to_owned().into(),
+            "red".to_owned(),
         ))
         .expect("Failed to modify Mouse's hats");
 
@@ -256,7 +256,7 @@ fn permissions_differ_not_only_by_names() {
     let set_shoes_color = SetKeyValueBox::asset(
         mouse_shoes_id.clone(),
         Name::from_str("color").expect("Valid"),
-        "yellow".to_owned().into(),
+        "yellow".to_owned(),
     );
     let _err = client
         .submit_blocking(set_shoes_color.clone())
@@ -330,11 +330,8 @@ fn stored_vs_granted_token_payload() -> Result<()> {
         .expect("Failed to grant permission to alice.");
 
     // Check that alice can indeed mint mouse asset
-    let set_key_value = SetKeyValueBox::asset(
-        mouse_asset,
-        Name::from_str("color")?,
-        "red".to_owned().into(),
-    );
+    let set_key_value =
+        SetKeyValueBox::asset(mouse_asset, Name::from_str("color")?, "red".to_owned());
     iroha_client
         .submit_blocking(set_key_value)
         .expect("Failed to mint asset for mouse.");

client/tests/integration/triggers/time_trigger.rs

@@ -168,7 +168,7 @@ fn pre_commit_trigger_should_be_executed() -> Result<()> {
         let sample_isi = SetKeyValueBox::account(
             account_id.clone(),
             "key".parse::<Name>()?,
-            String::from("value").into(),
+            String::from("value"),
         );
         test_client.submit(sample_isi)?;
     }
@@ -301,7 +301,7 @@ fn submit_sample_isi_on_every_block_commit(
         let sample_isi = SetKeyValueBox::account(
             account_id.clone(),
             "key".parse::<Name>()?,
-            String::from("value").into(),
+            String::from("value"),
         );
         test_client.submit(sample_isi)?;
     }

core/src/smartcontracts/isi/mod.rs

@@ -264,7 +264,7 @@ mod tests {
         SetKeyValueBox::asset(
             asset_id.clone(),
             Name::from_str("Bytes")?,
-            vec![1_u32, 2_u32, 3_u32].into(),
+            vec![1_u32, 2_u32, 3_u32],
         )
         .execute(&account_id, &mut wsv)?;
         let asset = wsv.asset(&asset_id)?;
@@ -291,7 +291,7 @@ mod tests {
         SetKeyValueBox::account(
             account_id.clone(),
             Name::from_str("Bytes")?,
-            vec![1_u32, 2_u32, 3_u32].into(),
+            vec![1_u32, 2_u32, 3_u32],
         )
         .execute(&account_id, &mut wsv)?;
         let bytes = wsv.map_account(&account_id, |account| {
@@ -320,7 +320,7 @@ mod tests {
         SetKeyValueBox::asset_definition(
             definition_id.clone(),
             Name::from_str("Bytes")?,
-            vec![1_u32, 2_u32, 3_u32].into(),
+            vec![1_u32, 2_u32, 3_u32],
         )
         .execute(&account_id, &mut wsv)?;
         let bytes = wsv
@@ -348,7 +348,7 @@ mod tests {
         SetKeyValueBox::domain(
             domain_id.clone(),
             Name::from_str("Bytes")?,
-            vec![1_u32, 2_u32, 3_u32].into(),
+            vec![1_u32, 2_u32, 3_u32],
         )
         .execute(&account_id, &mut wsv)?;
         let bytes = wsv

data_model/src/isi.rs

@@ -475,27 +475,27 @@ isi_box! {
 
 impl SetKeyValueBox {
     /// Constructs a new [`SetKeyValueBox`] for a [`Domain`] with the given `key` and `value`.
-    pub fn domain(domain_id: DomainId, key: Name, value: Value) -> Self {
-        Self::Domain(SetKeyValue::new(domain_id, key, value))
+    pub fn domain(domain_id: DomainId, key: Name, value: impl Into<Value>) -> Self {
+        Self::Domain(SetKeyValue::new(domain_id, key, value.into()))
     }
 
     /// Constructs a new [`SetKeyValueBox`] for an [`Account`] with the given `key` and `value`.
-    pub fn account(account_id: AccountId, key: Name, value: Value) -> Self {
-        Self::Account(SetKeyValue::new(account_id, key, value))
+    pub fn account(account_id: AccountId, key: Name, value: impl Into<Value>) -> Self {
+        Self::Account(SetKeyValue::new(account_id, key, value.into()))
     }
 
     /// Constructs a new [`SetKeyValueBox`] for an [`AssetDefinition`] with the given `key` and `value`.
     pub fn asset_definition(
         asset_definition_id: AssetDefinitionId,
         key: Name,
-        value: Value,
+        value: impl Into<Value>,
     ) -> Self {
-        Self::AssetDefinition(SetKeyValue::new(asset_definition_id, key, value))
+        Self::AssetDefinition(SetKeyValue::new(asset_definition_id, key, value.into()))
     }
 
     /// Constructs a new [`SetKeyValueBox`] for an [`Asset`] with the given `key` and `value`.
-    pub fn asset(asset_id: AssetId, key: Name, value: Value) -> Self {
-        Self::Asset(SetKeyValue::new(asset_id, key, value))
+    pub fn asset(asset_id: AssetId, key: Name, value: impl Into<Value>) -> Self {
+        Self::Asset(SetKeyValue::new(asset_id, key, value.into()))
     }
 }