fix(tari-bor): ciborium_io error for nostd after merge

dan_layer/engine/tests/templates/buggy/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 tari_template_abi = { path = "../../../../template_abi", default-features = false, features = ["alloc"] }
-tari_bor = { path = "../../../../tari_bor", default-features = false }
+tari_bor = { path = "../../../../tari_bor", default-features = false, features = ["alloc"] }
 lol_alloc = "0.4.0"
 
 [profile.release]

dan_layer/tari_bor/Cargo.toml

@@ -10,7 +10,7 @@ license = "BSD-3-Clause"
 [dependencies]
 # git rev: include fix from https://github.com/enarx/ciborium/pull/80
 ciborium = { git = "https://github.com/enarx/ciborium.git", rev = "114614d2a61102eb2321c68e53799d1e6f087aef", default-features = false }
-ciborium-io = { version = "0.2.1", default-features = false }
+ciborium-io = { git = "https://github.com/enarx/ciborium.git", rev = "114614d2a61102eb2321c68e53799d1e6f087aef", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
 
 [dev-dependencies]

dan_layer/tari_bor/src/error.rs

@@ -0,0 +1,34 @@
+//   Copyright 2023 The Tari Project
+//   SPDX-License-Identifier: BSD-3-Clause
+
+#[cfg(not(feature = "std"))]
+use alloc::{format, string::String};
+
+#[derive(Debug, Clone)]
+pub struct BorError(String);
+
+impl BorError {
+    pub fn new(str: String) -> Self {
+        Self(str)
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::fmt::Display for BorError {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for BorError {
+    fn description(&self) -> &str {
+        &self.0
+    }
+}
+
+impl From<ciborium::value::Error> for BorError {
+    fn from(value: ciborium::value::Error) -> Self {
+        BorError(format!("{}", value))
+    }
+}

dan_layer/tari_bor/src/lib.rs

@@ -4,51 +4,23 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(not(feature = "std"))]
-use alloc::{format, string::String, string::ToString, vec::Vec};
+use alloc::{format, string::ToString, vec::Vec};
 
 #[cfg(not(feature = "std"))]
 extern crate alloc;
 
 mod tag;
 pub use tag::*;
 
+mod error;
 mod walker;
-
 pub use ciborium::value::Value;
 use ciborium::{de::from_reader, ser::into_writer};
+pub use error::BorError;
 pub use serde;
 use serde::{de::DeserializeOwned, Serialize};
 pub use walker::*;
 
-#[derive(Debug, Clone)]
-pub struct BorError(String);
-
-impl BorError {
-    pub fn new(str: String) -> Self {
-        Self(str)
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::fmt::Display for BorError {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for BorError {
-    fn description(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<ciborium::value::Error> for BorError {
-    fn from(value: ciborium::value::Error) -> Self {
-        BorError(format!("{}", value))
-    }
-}
-
 pub fn encode_with_len<T: Serialize>(val: &T) -> Vec<u8> {
     let mut buf = Vec::with_capacity(512);
     buf.extend([0u8; 4]);
@@ -62,8 +34,12 @@ pub fn encode_with_len<T: Serialize>(val: &T) -> Vec<u8> {
 }
 
 #[cfg(not(feature = "std"))]
-pub fn encode_into<T: Serialize + ?Sized, W: ciborium_io::Write>(val: &T, writer: &mut W) -> Result<(), BorError>
-where W::Error: core::fmt::Debug {
+pub fn encode_into<T, W>(val: &T, writer: &mut W) -> Result<(), BorError>
+where
+    W::Error: core::fmt::Debug,
+    T: Serialize + ?Sized,
+    W: ciborium_io::Write,
+{
     into_writer(&val, writer).map_err(to_bor_error)
 }
 
@@ -72,17 +48,9 @@ pub fn encode_into<T: Serialize + ?Sized, W: std::io::Write>(val: &T, writer: &m
     into_writer(&val, writer).map_err(to_bor_error)
 }
 
-#[cfg(not(feature = "std"))]
-pub fn encode<T: Serialize + ?Sized>(val: &T) -> Result<Vec<u8>, BorError> {
-    let mut buf = Vec::with_capacity(512);
-    encode_into(val, &mut buf).map_err(|_| BorError(String::new()))?;
-    Ok(buf)
-}
-
-#[cfg(feature = "std")]
 pub fn encode<T: Serialize + ?Sized>(val: &T) -> Result<Vec<u8>, BorError> {
     let mut buf = Vec::with_capacity(512);
-    encode_into(val, &mut buf).map_err(|e| BorError(format!("{:?}", e)))?;
+    encode_into(val, &mut buf).map_err(|e| BorError::new(format!("{:?}", e)))?;
     Ok(buf)
 }
 
@@ -98,7 +66,7 @@ fn decode_inner<T: DeserializeOwned>(input: &mut &[u8]) -> Result<T, BorError> {
 pub fn decode_exact<T: DeserializeOwned>(mut input: &[u8]) -> Result<T, BorError> {
     let val = decode_inner(&mut input)?;
     if !input.is_empty() {
-        return Err(BorError(format!(
+        return Err(BorError::new(format!(
             "decode_exact: {} bytes remaining on input",
             input.len()
         )));
@@ -108,7 +76,7 @@ pub fn decode_exact<T: DeserializeOwned>(mut input: &[u8]) -> Result<T, BorError
 
 pub fn decode_len(input: &[u8]) -> Result<usize, BorError> {
     if input.len() < 4 {
-        return Err(BorError("Not enough bytes to decode length".to_string()));
+        return Err(BorError::new("Not enough bytes to decode length".to_string()));
     }
 
     let mut buf = [0u8; 4];
@@ -119,5 +87,5 @@ pub fn decode_len(input: &[u8]) -> Result<usize, BorError> {
 
 fn to_bor_error<E>(e: E) -> BorError
 where E: core::fmt::Display {
-    BorError(e.to_string())
+    BorError::new(e.to_string())
 }