feat: use "serde_json" for "BlobType" string conversion (#2364)

* feat: use "serde_json" for "BlobType" string conversion * chore: rebuild CLI.md * fix: use "serde_json" inside original string conversion code * fix: improve FromStr impl * fix: roll back "clap-markdown" to "0.1.3" * fix: roll back "clap" to "4.4.11" * fix: roll back "Cargo.lock" * fix: use "match" to avoid "unwrap" * chore: clippy
linera-io · Aug 9, 2024 · 4189b55 · 4189b55
1 parent fb59fd4
commit 4189b55
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/linera-base/Cargo.toml b/linera-base/Cargo.toml
@@ -37,6 +37,7 @@ rand.workspace = true
 serde.workspace = true
 serde-name.workspace = true
 serde_bytes.workspace = true
+serde_json.workspace = true
 sha3.workspace = true
 test-strategy = { workspace = true, optional = true }
 thiserror.workspace = true

diff --git a/linera-base/src/identifiers.rs b/linera-base/src/identifiers.rs
@@ -169,22 +169,18 @@ pub enum BlobType {
 
 impl Display for BlobType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            BlobType::Data => write!(f, "Data")?,
-        };
-
-        Ok(())
+        match serde_json::to_string(self) {
+            Ok(s) => write!(f, "{}", s),
+            Err(_) => Err(fmt::Error),
+        }
     }
 }
 
 impl FromStr for BlobType {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "Data" => Ok(BlobType::Data),
-            _ => Err(anyhow!("Invalid blob type: {}", s)),
-        }
+        serde_json::from_str(s).with_context(|| format!("Invalid BlobType: {}", s))
     }
 }