revert: handle operator payout address change in get_protx_listdiff (#45

)

This reverts commit ca61af3.

json/src/lib.rs

@@ -2106,7 +2106,7 @@ pub struct DMNStateDiff {
     pub voting_address: Option<[u8; 20]>,
     pub payout_address: Option<[u8; 20]>,
     pub pub_key_operator: Option<Vec<u8>>,
-    pub operator_payout_address: Option<[u8; 20]>,
+    pub operator_payout_address: Option<Option<[u8; 20]>>,
     pub platform_node_id: Option<[u8; 20]>,
     pub platform_p2p_port: Option<u32>,
     pub platform_http_port: Option<u32>,
@@ -2131,7 +2131,6 @@ impl TryFrom<DMNStateDiffIntermediate> for DMNStateDiff {
             platform_p2p_port,
             platform_http_port,
             payout_address,
-            operator_payout_address,
             pub_key_operator,
         } = value;
 
@@ -2162,15 +2161,7 @@ impl TryFrom<DMNStateDiffIntermediate> for DMNStateDiff {
                 })
             })
             .transpose()?;
-        let operator_payout_address = operator_payout_address
-            .map(|address| {
-                let address = Address::from_str(address.as_str())?;
-                address.payload_to_vec().try_into().map_err(|_| encode::Error::InvalidVectorSize {
-                    expected: 20,
-                    actual: address.payload_to_vec().len(),
-                })
-            })
-            .transpose()?;
+        let operator_payout_address = None; //todo
 
         let platform_node_id = platform_node_id
             .map(|address| {
@@ -2273,7 +2264,7 @@ impl DMNState {
                 != newer.operator_payout_address
             {
                 has_diff = true;
-                newer.operator_payout_address
+                Some(newer.operator_payout_address)
             } else {
                 None
             },
@@ -2342,7 +2333,9 @@ impl DMNState {
         if let Some(payout_address) = payout_address {
             self.payout_address = payout_address;
         }
-        self.operator_payout_address = operator_payout_address;
+        if let Some(operator_payout_address) = operator_payout_address {
+            self.operator_payout_address = operator_payout_address;
+        }
         if let Some(platform_node_id) = platform_node_id {
             self.platform_node_id = Some(platform_node_id);
         }
@@ -2894,8 +2887,6 @@ pub struct DMNStateDiffIntermediate {
     pub platform_http_port: Option<u32>,
     #[serde(default)]
     pub payout_address: Option<String>,
-    #[serde(default)]
-    pub operator_payout_address: Option<String>,
     #[serde(default, deserialize_with = "deserialize_hex_opt")]
     pub pub_key_operator: Option<Vec<u8>>,
 }