Restart negotiations #1150
Merged
Restart negotiations #1150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…start-negotiations
5 tasks
|
I'm still lacking |
tworec
force-pushed
the
market/restart-negotiations
branch
from
3df3c1c
to
bf186c5
Compare
tworec
reviewed
Apr 27, 2021
core/market/src/db/dao/proposal.rs
Outdated
| @@ -72,6 +72,10 @@ impl<'c> ProposalDao<'c> { | |||
| return Err(SaveProposalError::AlreadyCountered(prev_proposal)); | |||
| } | |||
|
|
|||
| // Proposal could be in Rejected state. It is ok to counter Rejected Proposal, | |||
| // but we must change state of prev Proposal to Draft. | |||
| update_proposal_state(conn, &prev_proposal, ProposalState::Draft)?; | |||
There was a problem hiding this comment.
this unconditional state change worries me
tworec
reviewed
Apr 27, 2021
| .unwrap() | ||
| .body | ||
| .state, | ||
| ProposalState::Draft |
There was a problem hiding this comment.
I'd expect some finalized agreement as a conclusion of restarted negotation
tworec
approved these changes
May 18, 2021
| @@ -63,18 +63,30 @@ impl<'c> ProposalDao<'c> { | |||
| pub async fn save_proposal(&self, proposal: &Proposal) -> Result<(), SaveProposalError> { | |||
| let proposal = proposal.body.clone(); | |||
| do_with_transaction(self.pool, move |conn| { | |||
| let prev_proposal = proposal | |||
| let prev_proposal_id = proposal | |||
|
|
||
| // If previous Proposal was rejected, we must change it's state back. | ||
| if prev_proposal.state == ProposalState::Rejected { | ||
| // If rejected Proposal doesn't have prev_proposal_id, it was Initial Proposal. |
| @@ -984,7 +985,7 @@ async fn test_restart_negotiations() { | |||
| .await | |||
| .unwrap(); | |||
|
|
|||
| let prov_proposal_id = req_market | |||
| let req_proposal_id = req_market | |||
There was a problem hiding this comment.
Suggested change
| let req_proposal_id = req_market | |
| // now the magic begins. We are countering a rejected proposal | |
| let req_proposal_id = req_market |
| @@ -1026,6 +1030,45 @@ async fn test_restart_negotiations() { | |||
| .state, | |||
| ProposalState::Draft | |||
| ); | |||
|
|
|||
| // Agents should be able to sign Agreement after rejection. | |||
| .unwrap() | ||
| .body | ||
| .state, | ||
| ProposalState::Initial |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resolves: #1128