Update CommitMessage creation code
This commit is contained in:
parent
ea3fe8b863
commit
4582807822
45
src/api.rs
45
src/api.rs
@ -831,15 +831,14 @@ fn handle_prd(
|
|||||||
let updated_state = to_update.clone();
|
let updated_state = to_update.clone();
|
||||||
|
|
||||||
let validated_state = Some(to_update.state_id);
|
let validated_state = Some(to_update.state_id);
|
||||||
let mut commit_msg = CommitMessage::new_update_commitment(
|
let mut commit_msg = CommitMessage::new(
|
||||||
prd.process_id,
|
prd.process_id,
|
||||||
updated_state.pcd_commitment,
|
updated_state.pcd_commitment,
|
||||||
updated_state.roles,
|
updated_state.roles,
|
||||||
updated_state.public_data
|
updated_state.public_data,
|
||||||
|
updated_state.validation_tokens,
|
||||||
);
|
);
|
||||||
|
|
||||||
commit_msg.set_validation_tokens(updated_state.validation_tokens);
|
|
||||||
|
|
||||||
// We must return an update of the process
|
// We must return an update of the process
|
||||||
let updated_process = UpdatedProcess {
|
let updated_process = UpdatedProcess {
|
||||||
process_id: prd.process_id,
|
process_id: prd.process_id,
|
||||||
@ -1168,11 +1167,12 @@ pub fn create_new_process(
|
|||||||
processes.insert(process_id, process.clone());
|
processes.insert(process_id, process.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
let commit_msg = CommitMessage::new_update_commitment(
|
let commit_msg = CommitMessage::new(
|
||||||
process_id,
|
process_id,
|
||||||
pcd_commitment,
|
pcd_commitment,
|
||||||
roles,
|
roles,
|
||||||
public_data,
|
public_data,
|
||||||
|
vec![],
|
||||||
);
|
);
|
||||||
|
|
||||||
let updated_process = UpdatedProcess {
|
let updated_process = UpdatedProcess {
|
||||||
@ -1270,11 +1270,12 @@ pub fn update_process(
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|
||||||
let commit_msg = CommitMessage::new_update_commitment(
|
let commit_msg = CommitMessage::new(
|
||||||
process_id,
|
process_id,
|
||||||
new_state.pcd_commitment,
|
new_state.pcd_commitment,
|
||||||
roles,
|
roles,
|
||||||
new_state.public_data,
|
new_state.public_data,
|
||||||
|
vec![]
|
||||||
);
|
);
|
||||||
|
|
||||||
Ok(ApiReturn {
|
Ok(ApiReturn {
|
||||||
@ -1445,11 +1446,12 @@ pub fn evaluate_state(process_id: String, previous_state: Option<ProcessState>,
|
|||||||
|
|
||||||
// We create a commit msg with the valid state
|
// We create a commit msg with the valid state
|
||||||
let outpoint: OutPoint = OutPoint::from_str(&process_id)?;
|
let outpoint: OutPoint = OutPoint::from_str(&process_id)?;
|
||||||
let commit_msg = CommitMessage::new_update_commitment(
|
let commit_msg = CommitMessage::new(
|
||||||
outpoint,
|
outpoint,
|
||||||
process_state.pcd_commitment,
|
process_state.pcd_commitment,
|
||||||
process_state.roles,
|
process_state.roles,
|
||||||
process_state.public_data,
|
process_state.public_data,
|
||||||
|
vec![]
|
||||||
);
|
);
|
||||||
|
|
||||||
Ok(ApiReturn {
|
Ok(ApiReturn {
|
||||||
@ -1479,26 +1481,13 @@ fn add_validation_token(mut process: Process, state_id: String, approval: bool)
|
|||||||
update_state.validation_tokens.push(proof);
|
update_state.validation_tokens.push(proof);
|
||||||
}
|
}
|
||||||
|
|
||||||
let commit_msg: Option<CommitMessage> =
|
let mut commit_msg = CommitMessage::new(
|
||||||
{
|
process_id,
|
||||||
let update_state = process.get_state_for_id(&state_id)?;
|
update_state.pcd_commitment.clone(),
|
||||||
// if the state is valid we also add a commit msg
|
update_state.roles.clone(),
|
||||||
let update_is_valid = update_state.is_valid(process.get_parent_state(&update_state.commited_in));
|
update_state.public_data.clone(),
|
||||||
if update_is_valid.is_ok() {
|
update_state.validation_tokens.clone()
|
||||||
|
);
|
||||||
let mut commit_msg = CommitMessage::new_update_commitment(
|
|
||||||
process.get_process_id()?,
|
|
||||||
update_state.pcd_commitment.clone(),
|
|
||||||
update_state.roles.clone(),
|
|
||||||
update_state.public_data.clone(),
|
|
||||||
);
|
|
||||||
commit_msg.set_validation_tokens(update_state.validation_tokens.clone());
|
|
||||||
Some(commit_msg)
|
|
||||||
} else {
|
|
||||||
debug!("No commit msg");
|
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let updated_process = UpdatedProcess {
|
let updated_process = UpdatedProcess {
|
||||||
process_id,
|
process_id,
|
||||||
@ -1511,7 +1500,7 @@ fn add_validation_token(mut process: Process, state_id: String, approval: bool)
|
|||||||
|
|
||||||
Ok(ApiReturn {
|
Ok(ApiReturn {
|
||||||
updated_process: Some(updated_process),
|
updated_process: Some(updated_process),
|
||||||
commit_to_send: commit_msg,
|
commit_to_send: Some(commit_msg),
|
||||||
ciphers_to_send,
|
ciphers_to_send,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user