Skip to content

Commit bd6efdb

Browse files
revert: handle operator payout address change in get_protx_listdiff (#45)
This reverts commit ca61af3.
1 parent 1fdb29b commit bd6efdb

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

json/src/lib.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,7 +2106,7 @@ pub struct DMNStateDiff {
21062106
pub voting_address: Option<[u8; 20]>,
21072107
pub payout_address: Option<[u8; 20]>,
21082108
pub pub_key_operator: Option<Vec<u8>>,
2109-
pub operator_payout_address: Option<[u8; 20]>,
2109+
pub operator_payout_address: Option<Option<[u8; 20]>>,
21102110
pub platform_node_id: Option<[u8; 20]>,
21112111
pub platform_p2p_port: Option<u32>,
21122112
pub platform_http_port: Option<u32>,
@@ -2131,7 +2131,6 @@ impl TryFrom<DMNStateDiffIntermediate> for DMNStateDiff {
21312131
platform_p2p_port,
21322132
platform_http_port,
21332133
payout_address,
2134-
operator_payout_address,
21352134
pub_key_operator,
21362135
} = value;
21372136

@@ -2162,15 +2161,7 @@ impl TryFrom<DMNStateDiffIntermediate> for DMNStateDiff {
21622161
})
21632162
})
21642163
.transpose()?;
2165-
let operator_payout_address = operator_payout_address
2166-
.map(|address| {
2167-
let address = Address::from_str(address.as_str())?;
2168-
address.payload_to_vec().try_into().map_err(|_| encode::Error::InvalidVectorSize {
2169-
expected: 20,
2170-
actual: address.payload_to_vec().len(),
2171-
})
2172-
})
2173-
.transpose()?;
2164+
let operator_payout_address = None; //todo
21742165

21752166
let platform_node_id = platform_node_id
21762167
.map(|address| {
@@ -2273,7 +2264,7 @@ impl DMNState {
22732264
!= newer.operator_payout_address
22742265
{
22752266
has_diff = true;
2276-
newer.operator_payout_address
2267+
Some(newer.operator_payout_address)
22772268
} else {
22782269
None
22792270
},
@@ -2342,7 +2333,9 @@ impl DMNState {
23422333
if let Some(payout_address) = payout_address {
23432334
self.payout_address = payout_address;
23442335
}
2345-
self.operator_payout_address = operator_payout_address;
2336+
if let Some(operator_payout_address) = operator_payout_address {
2337+
self.operator_payout_address = operator_payout_address;
2338+
}
23462339
if let Some(platform_node_id) = platform_node_id {
23472340
self.platform_node_id = Some(platform_node_id);
23482341
}
@@ -2894,8 +2887,6 @@ pub struct DMNStateDiffIntermediate {
28942887
pub platform_http_port: Option<u32>,
28952888
#[serde(default)]
28962889
pub payout_address: Option<String>,
2897-
#[serde(default)]
2898-
pub operator_payout_address: Option<String>,
28992890
#[serde(default, deserialize_with = "deserialize_hex_opt")]
29002891
pub pub_key_operator: Option<Vec<u8>>,
29012892
}

0 commit comments

Comments
 (0)