Remove DynError and some chores

rust/Cargo.toml

@@ -9,6 +9,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/freenet/freenet-stdlib"
 
 [dependencies]
+anyhow = "1"
 arbitrary = { version = "1", optional = true, features = ["derive"] }
 bincode = "1"
 byteorder = "1"

rust/src/client_api.rs

@@ -43,7 +43,7 @@ pub enum Error {
     #[error("connection closed")]
     ConnectionClosed,
     #[error("unhandled error: {0}")]
-    OtherError(Box<dyn std::error::Error + Send + Sync>),
+    OtherError(anyhow::Error),
 }
 
 pub trait TryFromFbs<T>: Sized {
@@ -56,7 +56,7 @@ pub enum WsApiError {
     #[error("Unsupported contract version")]
     UnsupportedContractVersion,
     #[error("Failed unpacking contract container")]
-    UnpackingContractContainerError(Box<dyn std::error::Error + Send + Sync + 'static>),
+    UnpackingContractContainerError(anyhow::Error),
     #[error("Failed decoding message from client request: {cause}")]
     DeserError { cause: String },
 }

rust/src/client_api/client_events.rs

@@ -1378,7 +1378,7 @@ mod client_request_test {
     const EXPECTED_ENCODED_CONTRACT_ID: &str = "6kVs66bKaQAC6ohr8b43SvJ95r36tc2hnG7HezmaJHF9";
 
     #[test]
-    fn test_build_contract_put_op_from_fbs() -> Result<(), Box<dyn std::error::Error>> {
+    fn test_build_contract_put_op_from_fbs() -> Result<(), anyhow::Error> {
         let put_req_op = vec![
             4, 0, 0, 0, 244, 255, 255, 255, 16, 0, 0, 0, 0, 0, 0, 1, 8, 0, 12, 0, 11, 0, 4, 0, 8,
             0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 198, 255, 255, 255, 12, 0, 0, 0, 20, 0, 0, 0, 36, 0,
@@ -1418,7 +1418,7 @@ mod client_request_test {
     }
 
     #[test]
-    fn test_build_contract_get_op_from_fbs() -> Result<(), Box<dyn std::error::Error>> {
+    fn test_build_contract_get_op_from_fbs() -> Result<(), anyhow::Error> {
         let get_req_op = vec![
             4, 0, 0, 0, 244, 255, 255, 255, 16, 0, 0, 0, 0, 0, 0, 1, 8, 0, 12, 0, 11, 0, 4, 0, 8,
             0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 3, 222, 255, 255, 255, 12, 0, 0, 0, 8, 0, 12, 0, 8, 0, 4,
@@ -1448,7 +1448,7 @@ mod client_request_test {
     }
 
     #[test]
-    fn test_build_contract_update_op_from_fbs() -> Result<(), Box<dyn std::error::Error>> {
+    fn test_build_contract_update_op_from_fbs() -> Result<(), anyhow::Error> {
         let update_op = vec![
             4, 0, 0, 0, 220, 255, 255, 255, 8, 0, 0, 0, 0, 0, 0, 1, 232, 255, 255, 255, 8, 0, 0, 0,
             0, 0, 0, 2, 204, 255, 255, 255, 16, 0, 0, 0, 52, 0, 0, 0, 8, 0, 12, 0, 11, 0, 4, 0, 8,

rust/src/client_api/regular.rs

@@ -222,10 +222,7 @@ mod test {
             Server { recv, listener }
         }
 
-        async fn listen(
-            self,
-            tx: tokio::sync::oneshot::Sender<()>,
-        ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        async fn listen(self, tx: tokio::sync::oneshot::Sender<()>) -> Result<(), anyhow::Error> {
             let (stream, _) =
                 tokio::time::timeout(Duration::from_millis(10), self.listener.accept()).await??;
             let mut stream = tokio_tungstenite::accept_async(stream).await?;
@@ -248,7 +245,7 @@ mod test {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_send() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    async fn test_send() -> Result<(), anyhow::Error> {
         let port = PORT.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
         let server = Server::new(port, true).await;
         let (tx, rx) = tokio::sync::oneshot::channel::<()>();
@@ -266,7 +263,7 @@ mod test {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-    async fn test_recv() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+    async fn test_recv() -> Result<(), anyhow::Error> {
         let port = PORT.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
         let server = Server::new(port, false).await;
         let (tx, rx) = tokio::sync::oneshot::channel::<()>();

rust/src/contract_interface.rs

@@ -863,7 +863,7 @@ impl ContractCode<'_> {
         let key_arr = hasher.finalize();
         debug_assert_eq!(key_arr[..].len(), CONTRACT_KEY_SIZE);
         let mut key = [0; CONTRACT_KEY_SIZE];
-        key.copy_from_slice(&key_arr);
+        key.copy_from_slice(key_arr.as_ref());
         CodeHash(key)
     }
 }
@@ -1052,7 +1052,7 @@ impl ContractKey {
         let full_key_arr = hasher.finalize();
 
         let mut spec = [0; CONTRACT_KEY_SIZE];
-        spec.copy_from_slice(&full_key_arr);
+        spec.copy_from_slice(full_key_arr.as_ref());
         Ok(Self {
             instance: ContractInstanceId(spec),
             code: Some(CodeHash(code_key)),
@@ -1134,7 +1134,7 @@ fn generate_id<'a>(
 
     debug_assert_eq!(full_key_arr[..].len(), CONTRACT_KEY_SIZE);
     let mut spec = [0; CONTRACT_KEY_SIZE];
-    spec.copy_from_slice(&full_key_arr);
+    spec.copy_from_slice(full_key_arr.as_ref());
     ContractInstanceId(spec)
 }
 
@@ -1564,7 +1564,7 @@ mod test {
     });
 
     #[test]
-    fn key_encoding() -> Result<(), Box<dyn std::error::Error>> {
+    fn key_encoding() -> Result<(), anyhow::Error> {
         let code = ContractCode::from(vec![1, 2, 3]);
         let expected = ContractKey::from_params_and_code(Parameters::from(vec![]), &code);
         // let encoded_key = expected.encode();
@@ -1579,7 +1579,7 @@ mod test {
     }
 
     #[test]
-    fn key_ser() -> Result<(), Box<dyn std::error::Error>> {
+    fn key_ser() -> Result<(), anyhow::Error> {
         let mut gen = arbitrary::Unstructured::new(&*RND_BYTES);
         let expected: ContractKey = gen.arbitrary()?;
         let encoded = bs58::encode(expected.as_bytes()).into_string();
@@ -1594,7 +1594,7 @@ mod test {
     }
 
     #[test]
-    fn contract_ser() -> Result<(), Box<dyn std::error::Error>> {
+    fn contract_ser() -> Result<(), anyhow::Error> {
         let mut gen = arbitrary::Unstructured::new(&*RND_BYTES);
         let expected: Contract = gen.arbitrary()?;
 

rust/src/delegate_interface.rs

@@ -253,7 +253,7 @@ impl DelegateKey {
 
         debug_assert_eq!(full_key_arr[..].len(), DELEGATE_HASH_LENGTH);
         let mut key = [0; DELEGATE_HASH_LENGTH];
-        key.copy_from_slice(&full_key_arr);
+        key.copy_from_slice(full_key_arr.as_ref());
 
         Ok(Self {
             key,
@@ -309,7 +309,7 @@ fn generate_id<'a>(
 
     debug_assert_eq!(full_key_arr[..].len(), DELEGATE_HASH_LENGTH);
     let mut key = [0; DELEGATE_HASH_LENGTH];
-    key.copy_from_slice(&full_key_arr);
+    key.copy_from_slice(full_key_arr.as_ref());
     key
 }
 
@@ -328,7 +328,7 @@ impl SecretsId {
         hasher.update(&key);
         let hashed = hasher.finalize();
         let mut hash = [0; 32];
-        hash.copy_from_slice(&hashed);
+        hash.copy_from_slice(hashed.as_ref());
         Self { key, hash }
     }
 

rust/src/memory/buf.rs

@@ -354,7 +354,7 @@ mod test {
             (export "initiate_buffer" (func $initiate_buffer))
         )"#;
 
-    fn build_test_mod() -> Result<(Store, Instance), Box<dyn std::error::Error>> {
+    fn build_test_mod() -> Result<(Store, Instance), anyhow::Error> {
         let wasm_bytes = wat2wasm(TEST_MODULE.as_bytes())?;
         let mut store = Store::new(Cranelift::new());
         let module = Module::new(&store, wasm_bytes)?;
@@ -377,7 +377,7 @@ mod test {
 
     #[test]
     #[ignore]
-    fn read_and_write() -> Result<(), Box<dyn std::error::Error>> {
+    fn read_and_write() -> Result<(), anyhow::Error> {
         let (mut store, instance) = build_test_mod()?;
         let mem = instance.exports.get_memory("memory")?.view(&store);
         let linear_mem = WasmLinearMem {
@@ -402,7 +402,7 @@ mod test {
 
     #[test]
     #[ignore]
-    fn read_and_write_bytes() -> Result<(), Box<dyn std::error::Error>> {
+    fn read_and_write_bytes() -> Result<(), anyhow::Error> {
         let (mut store, instance) = build_test_mod()?;
         let mem = instance.exports.get_memory("memory")?.view(&store);
         let linear_mem = WasmLinearMem {
@@ -427,7 +427,7 @@ mod test {
 
     #[test]
     #[ignore]
-    fn update() -> Result<(), Box<dyn std::error::Error>> {
+    fn update() -> Result<(), anyhow::Error> {
         let (mut store, instance) = build_test_mod()?;
         let mem = instance.exports.get_memory("memory")?.view(&store);
         let linear_mem = WasmLinearMem {

rust/src/versioning.rs

@@ -157,10 +157,7 @@ impl DelegateCode<'static> {
 }
 
 impl DelegateCode<'_> {
-    pub fn to_bytes_versioned(
-        &self,
-        version: APIVersion,
-    ) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync + 'static>> {
+    pub fn to_bytes_versioned(&self, version: APIVersion) -> anyhow::Result<Vec<u8>> {
         match version {
             APIVersion::Version0_0_1 => {
                 let output_size =
@@ -362,20 +359,17 @@ impl Display for APIVersion {
 }
 
 impl<'a> TryFrom<&'a semver::Version> for APIVersion {
-    type Error = Box<dyn std::error::Error + Send + Sync>;
+    type Error = anyhow::Error;
     fn try_from(value: &'a semver::Version) -> Result<Self, Self::Error> {
         match value {
             ver if ver == &semver::Version::new(0, 0, 1) => Ok(APIVersion::Version0_0_1),
-            other => Err(format!("{other} version not supported").into()),
+            other => Err(anyhow::anyhow!("{other} version not supported")),
         }
     }
 }
 
 impl ContractCode<'_> {
-    pub fn to_bytes_versioned(
-        &self,
-        version: APIVersion,
-    ) -> Result<Vec<u8>, Box<dyn std::error::Error + Send + Sync + 'static>> {
+    pub fn to_bytes_versioned(&self, version: APIVersion) -> anyhow::Result<Vec<u8>> {
         match version {
             APIVersion::Version0_0_1 => {
                 let output_size =