absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 20:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Luke Parker
2022-07-20 06:23:07 -04:00
parent a733bb5865
commit cd8b116fd8
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
contracts/multisig/lib.rs
View File

@@ -154,19 +154,26 @@ mod multisig {
} }
self.voted.insert((validator, keys_hash), &()); self.voted.insert((validator, keys_hash), &());
let votes = if let Some(votes) = self.votes.get((global_validator_set, validator_set, keys_hash)) { let votes =
self.env().emit_event(Vote { validator, global_validator_set, validator_set, hash: keys_hash, keys: None }); if let Some(votes) = self.votes.get((global_validator_set, validator_set, keys_hash)) {
votes + shares self.env().emit_event(Vote {
} else { validator,
self.env().emit_event(Vote { global_validator_set,
validator, validator_set,
global_validator_set, hash: keys_hash,
validator_set, keys: None,
hash: keys_hash, });
keys: Some(keys.clone()), votes + shares
}); } else {
shares self.env().emit_event(Vote {
}; validator,
global_validator_set,
validator_set,
hash: keys_hash,
keys: Some(keys.clone()),
});
shares
};
// We could skip writing this if we've reached consensus, yet best to keep our ducks in a row // We could skip writing this if we've reached consensus, yet best to keep our ducks in a row
self.votes.insert((global_validator_set, validator_set, keys_hash), &votes); self.votes.insert((global_validator_set, validator_set, keys_hash), &votes);
@@ -232,7 +239,13 @@ mod multisig {
let decoded_event = <Event as scale::Decode>::decode(&mut &event.data[..]) let decoded_event = <Event as scale::Decode>::decode(&mut &event.data[..])
.expect("encountered invalid contract event data buffer"); .expect("encountered invalid contract event data buffer");
if let Event::Vote(Vote { validator, global_validator_set, validator_set, hash, keys: actual_keys }) = decoded_event if let Event::Vote(Vote {
validator,
global_validator_set,
validator_set,
hash,
keys: actual_keys,
}) = decoded_event
{ {
assert_eq!(validator, expected_validator); assert_eq!(validator, expected_validator);
assert_eq!(global_validator_set, *EXPECTED_GLOBAL_VALIDATOR_SET); assert_eq!(global_validator_set, *EXPECTED_GLOBAL_VALIDATOR_SET);