Adapt encoding for blockstore changes

filecoin-project · Mar 3, 2023 · f4f0f8c · f4f0f8c
1 parent c333c02
commit f4f0f8c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ipld/encoding/src/cbor_store.rs b/ipld/encoding/src/cbor_store.rs
@@ -1,7 +1,7 @@
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
 use cid::{multihash, Cid};
-use fvm_ipld_blockstore::{Block, Blockstore};
+use fvm_ipld_blockstore::Blockstore;
 use serde::{de, ser};
 
 use crate::DAG_CBOR;
@@ -28,13 +28,7 @@ pub trait CborStore: Blockstore + Sized {
         S: ser::Serialize,
     {
         let bytes = crate::to_vec(obj)?;
-        self.put(
-            code,
-            &Block {
-                codec: DAG_CBOR,
-                data: &bytes,
-            },
-        )
+        self.put(code.into(), &(DAG_CBOR, bytes))
     }
 }
 

diff --git a/ipld/encoding/src/ipld_block.rs b/ipld/encoding/src/ipld_block.rs
@@ -1,5 +1,6 @@
 use std::fmt::{Debug, Formatter};
 
+use fvm_ipld_blockstore::Block;
 // Copyright 2021-2023 Protocol Labs
 // SPDX-License-Identifier: Apache-2.0, MIT
 use serde::de::value;
@@ -33,6 +34,16 @@ impl Debug for IpldBlock {
     }
 }
 
+impl Block for IpldBlock {
+    fn codec(&self) -> u64 {
+        self.codec
+    }
+
+    fn data(&self) -> &[u8] {
+        &self.data
+    }
+}
+
 impl IpldBlock {
     pub fn deserialize<'de, T>(&'de self) -> Result<T, Error>
     where