فهرست منبع

wallet: remove defaults serialization from GetProperties net API

darkfi 1 سال پیش
والد
کامیت
a63e709c5f
2فایلهای تغییر یافته به همراه6 افزوده شده و 8 حذف شده
  1. 5 3
      bin/darkwallet/pydrk/api.py
  2. 1 5
      bin/darkwallet/src/net.rs

+ 5 - 3
bin/darkwallet/pydrk/api.py

@@ -6,7 +6,7 @@ Property = namedtuple("Property", [
     "name",
     "type",
     "subtype",
-    "defaults",
+    #"defaults",
     "ui_name",
     "desc",
     "is_null_allowed",
@@ -371,20 +371,22 @@ class Api:
         props_len = serial.decode_varint(cur)
         props = []
 
-        prop_read_fn = lambda cur: Api.read_prop_val(cur, prop_type)
         enum_read_fn = lambda cur: serial.decode_arr(cur, serial.decode_str)
 
         for _ in range(props_len):
             prop_name = serial.decode_str(cur)
             # We need prop_type below
             prop_type = serial.read_u8(cur)
+
+            prop_read_fn = lambda cur: Api.read_prop_val(cur, prop_type)
+
             prop = Property(
                 prop_name,
                 prop_type,
                 # subtype 
                 serial.read_u8(cur),
                 # defaults 
-                serial.decode_arr(cur, prop_read_fn),
+                #serial.decode_arr(cur, prop_read_fn),
                 # ui_name 
                 serial.decode_str(cur),
                 # desc 

+ 1 - 5
bin/darkwallet/src/net.rs

@@ -186,7 +186,7 @@ impl ZeroMQAdapter {
                     prop.name.encode(&mut reply).unwrap();
                     prop.typ.encode(&mut reply).unwrap();
                     prop.subtype.encode(&mut reply).unwrap();
-                    prop.defaults.encode(&mut reply).unwrap();
+                    //prop.defaults.encode(&mut reply).unwrap();
                     prop.ui_name.encode(&mut reply).unwrap();
                     prop.desc.encode(&mut reply).unwrap();
                     prop.is_null_allowed.encode(&mut reply).unwrap();
@@ -258,10 +258,6 @@ impl ZeroMQAdapter {
                         let val = String::decode(&mut cur).unwrap();
                         prop.set_enum(Role::User, prop_i, val)?;
                     }
-                    PropertyType::Buffer => {
-                        let val = Vec::<u8>::decode(&mut cur).unwrap();
-                        prop.set_buf(Role::User, prop_i, val)?;
-                    }
                     PropertyType::SceneNodeId => {
                         let val = SceneNodeId::decode(&mut cur).unwrap();
                         prop.set_node_id(Role::User, prop_i, val)?;