human-readable fix after merge

multiversx · Sep 5, 2024 · f634b3f · f634b3f
1 parent 1523cbb
commit f634b3f
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 71 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/data/human-readable/src/decode.rs b/data/human-readable/src/decode.rs
@@ -18,17 +18,7 @@ pub fn decode_human_readable_value(
     type_name: &str,
     contract_abi: &ContractAbi,
 ) -> Result<AnyValue, Box<dyn Error>> {
-    let type_description =
-        if let Some(type_description) = contract_abi.type_descriptions.0.get(type_name) {
-            type_description.to_owned()
-        } else {
-            TypeDescription {
-                docs: Vec::new(),
-                name: type_name.to_string(),
-                contents: TypeContents::NotSpecified,
-            }
-        };
-
+    let type_description = contract_abi.type_descriptions.find_or_default(type_name);
     decode_any_value(input, &type_description, &contract_abi)
 }
 
@@ -38,7 +28,9 @@ pub fn decode_any_value(
     contract_abi: &ContractAbi,
 ) -> Result<AnyValue, Box<dyn Error>> {
     match &type_description.contents {
-        TypeContents::NotSpecified => decode_single_value(input, type_description.name.as_str()),
+        TypeContents::NotSpecified => {
+            decode_single_value(input, type_description.names.abi.as_str())
+        },
         TypeContents::Enum(variants) => decode_enum(input, &variants, &contract_abi),
         TypeContents::Struct(fields) => decode_struct(input, &fields, &contract_abi),
         TypeContents::ExplicitEnum(_) => panic!("not supported"),
@@ -141,7 +133,7 @@ pub fn decode_struct(
         let value = input
             .child(&field.name)
             .ok_or_else(|| Box::new(DecodeError("missing field")))?;
-        let value = decode_human_readable_value(&value, &field.field_type, &contract_abi)?;
+        let value = decode_human_readable_value(&value, &field.field_type.abi, &contract_abi)?;
         field_values.push(StructField {
             name: field.name.clone(),
             value,
@@ -196,7 +188,7 @@ pub fn decode_enum(
     if variant.is_tuple_variant() && variant.fields.len() == 1 {
         let value = input.child(variant.name.as_str()).unwrap();
         let value =
-            decode_human_readable_value(&value, &variant.fields[0].field_type, contract_abi)?;
+            decode_human_readable_value(&value, &variant.fields[0].field_type.abi, contract_abi)?;
         return Ok(AnyValue::Enum(Box::new(crate::EnumVariant {
             discriminant: variant.discriminant,
             value,
@@ -219,7 +211,7 @@ pub fn decode_enum(
             let value = value.get(i).unwrap();
             let value = decode_human_readable_value(
                 &(value.to_owned().into()),
-                &field.field_type,
+                &field.field_type.abi,
                 &contract_abi,
             )?;
             field_values.push(StructField {

diff --git a/data/human-readable/src/defaults.rs b/data/human-readable/src/defaults.rs
@@ -13,17 +13,7 @@ pub fn default_value_for_abi_type(
     type_name: &str,
     contract_abi: &ContractAbi,
 ) -> Result<AnyValue, Box<dyn Error>> {
-    let type_description =
-        if let Some(type_description) = contract_abi.type_descriptions.0.get(type_name) {
-            type_description.to_owned()
-        } else {
-            TypeDescription {
-                docs: Vec::new(),
-                name: type_name.to_string(),
-                contents: TypeContents::NotSpecified,
-            }
-        };
-
+    let type_description = contract_abi.type_descriptions.find_or_default(type_name);
     default_value_for_any_value(&type_description, contract_abi)
 }
 
@@ -33,7 +23,7 @@ pub fn default_value_for_any_value(
 ) -> Result<AnyValue, Box<dyn Error>> {
     match &type_description.contents {
         TypeContents::NotSpecified => {
-            default_value_for_single_value(type_description.name.as_str())
+            default_value_for_single_value(type_description.names.abi.as_str())
         },
         TypeContents::Enum(variants) => default_value_for_enum(&variants, contract_abi),
         TypeContents::Struct(fields) => default_value_for_struct(&fields, contract_abi),
@@ -66,7 +56,7 @@ pub fn default_value_for_struct(
     let mut field_values: Vec<StructField> = vec![];
 
     for field in fields.iter() {
-        let value = default_value_for_abi_type(&field.field_type, &contract_abi)?;
+        let value = default_value_for_abi_type(&field.field_type.abi, &contract_abi)?;
         field_values.push(StructField {
             name: field.name.clone(),
             value,
@@ -94,15 +84,15 @@ pub fn default_value_for_enum(
 
     // handle tuple with only one field as a special case (we don't need a wrapper array)
     if variant.is_tuple_variant() && variant.fields.len() == 1 {
-        let value = default_value_for_abi_type(&variant.fields[0].field_type, contract_abi)?;
+        let value = default_value_for_abi_type(&variant.fields[0].field_type.abi, contract_abi)?;
         return Ok(AnyValue::Enum(Box::new(crate::EnumVariant {
             discriminant: variant.discriminant,
             value,
         })));
     } else if variant.is_tuple_variant() {
         let mut field_values: Vec<StructField> = vec![];
         for field in variant.fields.iter() {
-            let value = default_value_for_abi_type(&field.field_type, &contract_abi)?;
+            let value = default_value_for_abi_type(&field.field_type.abi, &contract_abi)?;
             field_values.push(StructField {
                 name: field.name.clone(),
                 value,

diff --git a/data/human-readable/src/encode.rs b/data/human-readable/src/encode.rs
@@ -13,17 +13,7 @@ pub fn encode_human_readable_value(
     type_name: &str,
     contract_abi: &ContractAbi,
 ) -> Result<HumanReadableValue, Box<dyn Error>> {
-    let type_description =
-        if let Some(type_description) = contract_abi.type_descriptions.0.get(type_name) {
-            type_description.to_owned()
-        } else {
-            TypeDescription {
-                docs: Vec::new(),
-                name: type_name.to_string(),
-                contents: TypeContents::NotSpecified,
-            }
-        };
-
+    let type_description = contract_abi.type_descriptions.find_or_default(type_name);
     encode_any_value(input, &type_description, &contract_abi)
 }
 
@@ -33,7 +23,9 @@ pub fn encode_any_value(
     contract_abi: &ContractAbi,
 ) -> Result<HumanReadableValue, Box<dyn Error>> {
     match &type_description.contents {
-        TypeContents::NotSpecified => encode_single_value(input, type_description.name.as_str()),
+        TypeContents::NotSpecified => {
+            encode_single_value(input, type_description.names.abi.as_str())
+        },
         TypeContents::Enum(variants) => encode_enum(input, &variants, &contract_abi),
         TypeContents::Struct(fields) => encode_struct(input, &fields, &contract_abi),
         TypeContents::ExplicitEnum(_) => panic!("not supported"),
@@ -146,7 +138,7 @@ pub fn encode_struct(
             .find(|f| f.name == field.name)
             .ok_or_else(|| Box::new(EncodeError("missing field")))?;
 
-        let value = encode_human_readable_value(&value.value, &field.field_type, contract_abi)?;
+        let value = encode_human_readable_value(&value.value, &field.field_type.abi, contract_abi)?;
         field_values.insert(field.name.to_owned(), value.get_value().to_owned());
     }
 
@@ -173,7 +165,7 @@ pub fn encode_enum(
     if variant.is_tuple_variant() && variant.fields.len() == 1 {
         let value = encode_human_readable_value(
             &enum_value.value,
-            &variant.fields[0].field_type,
+            &variant.fields[0].field_type.abi,
             contract_abi,
         )?;
         return Ok(JsonValue::Object(
@@ -192,8 +184,11 @@ pub fn encode_enum(
         let mut field_values: Vec<JsonValue> = vec![];
 
         for (field, field_type) in variant.fields.iter().zip(variant_fields.0.iter()) {
-            let value =
-                encode_human_readable_value(&field_type.value, &field.field_type, contract_abi)?;
+            let value = encode_human_readable_value(
+                &field_type.value,
+                &field.field_type.abi,
+                contract_abi,
+            )?;
             field_values.push(value.get_value().to_owned());
         }
 
@@ -212,7 +207,7 @@ pub fn encode_enum(
     let mut field_values: Map<String, JsonValue> = Map::new();
     for (field, field_type) in variant.fields.iter().zip(variant_fields.0.iter()) {
         let value =
-            encode_human_readable_value(&field_type.value, &field.field_type, contract_abi)?;
+            encode_human_readable_value(&field_type.value, &field.field_type.abi, contract_abi)?;
         field_values.insert(field.name.to_owned(), value.get_value().to_owned());
     }
 

diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
@@ -38,4 +38,11 @@ impl TypeNames {
             rust: alloc::string::String::new(),
         }
     }
+
+    pub const fn from_abi(abi_name: alloc::string::String) -> Self {
+        TypeNames {
+            abi: abi_name,
+            rust: alloc::string::String::new(),
+        }
+    }
 }
diff --git a/framework/base/src/abi/type_description_container.rs b/framework/base/src/abi/type_description_container.rs
@@ -1,4 +1,5 @@
 use super::*;
+use alloc::borrow::ToOwned;
 use multiversx_sc_codec::Vec;
 
 pub trait TypeDescriptionContainer {
@@ -20,6 +21,28 @@ pub trait TypeDescriptionContainer {
 #[derive(Clone, Default, Debug)]
 pub struct TypeDescriptionContainerImpl(pub Vec<(TypeNames, TypeDescription)>);
 
+impl TypeDescriptionContainerImpl {
+    pub fn find(&self, abi_type_name: &str) -> Option<&TypeDescription> {
+        self.0
+            .iter()
+            .find(|(existing_type_name, _)| &existing_type_name.abi == abi_type_name)
+            .map(|(_, description)| description)
+    }
+
+    pub fn find_or_default(&self, abi_type_name: &str) -> TypeDescription {
+        if let Some(type_description) = self.find(abi_type_name) {
+            type_description.clone()
+        } else {
+            TypeDescription {
+                docs: Vec::new(),
+                names: TypeNames::from_abi(abi_type_name.to_owned()),
+                contents: TypeContents::NotSpecified,
+                macro_attributes: Vec::new(),
+            }
+        }
+    }
+}
+
 impl TypeDescriptionContainer for TypeDescriptionContainerImpl {
     fn new() -> Self {
         TypeDescriptionContainerImpl(Vec::new())

diff --git a/framework/meta-lib/src/abi_json/contract_abi_json.rs b/framework/meta-lib/src/abi_json/contract_abi_json.rs
@@ -136,7 +136,10 @@ pub fn convert_json_to_type_descriptions(
 ) -> TypeDescriptionContainerImpl {
     let mut type_descriptions = TypeDescriptionContainerImpl::new();
     for (type_name, type_description) in types.into_iter() {
-        type_descriptions.insert(type_name, TypeDescription::from(&type_description));
+        type_descriptions.insert(
+            TypeNames::from_abi(type_name),
+            TypeDescription::from(&type_description),
+        );
     }
     type_descriptions
 }

diff --git a/framework/meta-lib/src/abi_json/endpoint_abi_json.rs b/framework/meta-lib/src/abi_json/endpoint_abi_json.rs
@@ -29,7 +29,7 @@ impl From<&InputAbiJson> for InputAbi {
     fn from(abi: &InputAbiJson) -> Self {
         InputAbi {
             arg_name: abi.arg_name.to_string(),
-            type_names: abi.type_names.clone(),
+            type_names: TypeNames::from_abi(abi.type_name.clone()),
             multi_arg: abi.multi_arg.unwrap_or(false),
         }
     }
@@ -69,7 +69,7 @@ impl From<&OutputAbiJson> for OutputAbi {
     fn from(abi: &OutputAbiJson) -> Self {
         OutputAbi {
             output_name: abi.output_name.clone(),
-            type_names: abi.type_name.clone(),
+            type_names: TypeNames::from_abi(abi.type_name.clone()),
             multi_result: abi.multi_result.unwrap_or(false),
         }
     }

diff --git a/framework/meta-lib/src/abi_json/type_abi_json.rs b/framework/meta-lib/src/abi_json/type_abi_json.rs
@@ -45,8 +45,9 @@ impl From<&TypeDescriptionJson> for TypeDescription {
         };
         TypeDescription {
             docs: abi.docs.iter().map(|line| line.to_string()).collect(),
-            name: "".to_string(),
+            names: TypeNames::new(),
             contents: content_type,
+            macro_attributes: Vec::new(),
         }
     }
 }

diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
@@ -30,12 +30,6 @@ pathdiff = "0.2.1"
 itertools = "0.13.0"
 colored = "2.0"
 unwrap-infallible = "0.1.5"
-clap = { version = "4.4.7", features = ["derive"] }
-tokio = { version = "1.24" }
-
-[[bin]]
-name = "sc-scenario"
-path = "src/main.rs"
 
 [features]
 default = ["wasm-incompatible"]