Explorar o código

remove asset_type from slab struct

ghassmo %!s(int64=5) %!d(string=hai) anos
pai
achega
8197b8bf16
Modificáronse 2 ficheiros con 4 adicións e 8 borrados
  1. 3 3
      src/bin/darkfid.rs
  2. 1 5
      src/blockchain/slab.rs

+ 3 - 3
src/bin/darkfid.rs

@@ -361,7 +361,7 @@ mod test {
                             // start gateway client
                             client.start().await.unwrap();
 
-                            let slab = Slab::new("btc".to_string(), rnd.to_le_bytes().to_vec());
+                            let slab = Slab::new(rnd.to_le_bytes().to_vec());
                             client.put_slab(slab).await.unwrap();
                         });
                         drop(signal);
@@ -401,7 +401,7 @@ mod test {
                 // start gateway client
                 client.start().await.unwrap();
 
-                let slab = Slab::new("btc".to_string(), rnd.to_le_bytes().to_vec());
+                let slab = Slab::new( rnd.to_le_bytes().to_vec());
 
                 client.put_slab(slab.clone()).await.unwrap();
                 client.put_slab(slab.clone()).await.unwrap();
@@ -496,7 +496,7 @@ mod test {
                 // start gateway client
                 client.start().await.unwrap();
 
-                let slab = Slab::new("btc".to_string(), rnd.to_le_bytes().to_vec());
+                let slab = Slab::new(rnd.to_le_bytes().to_vec());
 
                 client.put_slab(slab.clone()).await.unwrap();
                 client.put_slab(slab.clone()).await.unwrap();

+ 1 - 5
src/blockchain/slab.rs

@@ -3,16 +3,14 @@ use crate::Result;
 
 #[derive(Clone, Debug)]
 pub struct Slab {
-    asset_type: String,
     index: u64,
     payload: Vec<u8>,
 }
 
 impl Slab {
-    pub fn new(asset_type: String, payload: Vec<u8>) -> Self {
+    pub fn new(payload: Vec<u8>) -> Self {
         let index = 0;
         Slab {
-            asset_type,
             index,
             payload,
         }
@@ -34,7 +32,6 @@ impl Slab {
 impl Encodable for Slab {
     fn encode<S: std::io::Write>(&self, mut s: S) -> Result<usize> {
         let mut len = 0;
-        len += self.asset_type.encode(&mut s)?;
         len += self.index.encode(&mut s)?;
         len += self.payload.encode(&mut s)?;
         Ok(len)
@@ -44,7 +41,6 @@ impl Encodable for Slab {
 impl Decodable for Slab {
     fn decode<D: std::io::Read>(mut d: D) -> Result<Self> {
         Ok(Self {
-            asset_type: Decodable::decode(&mut d)?,
             index: Decodable::decode(&mut d)?,
             payload: Decodable::decode(&mut d)?,
         })