Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

AT DSL - Removing WaitCondition, consistently applying Condition instead #1513

Merged
merged 8 commits into from
Jun 3, 2019
Merged

AT DSL - Removing WaitCondition, consistently applying Condition instead #1513

merged 8 commits into from
Jun 3, 2019

Conversation

CjHare
Copy link
Contributor

@CjHare CjHare commented May 31, 2019

PR description

WaitCondition is really a Condition :. removing WaitCondition

Fixed Issue(s)

@CjHare CjHare marked this pull request as ready for review May 31, 2019 03:32

minerNode1.execute(cliqueTransactions.createAddProposal(minerNode2));
cluster.waitUntil(wait.chainHeadHasProgressedByAtLeast(minerNode1, 1));
cluster.verify(blockchain.minimumHeightProgression(minerNode1, 1));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

progression sounds a bit odd here. Is there a consistent phrasing or tense used or meant to be used for the dsl?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggested alternative?

Copy link
Contributor Author

@CjHare CjHare Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blockchain.reachesHeight() ?

minerNode1.execute(cliqueTransactions.createAddProposal(minerNode3));
minerNode2.execute(cliqueTransactions.createAddProposal(minerNode3));
cluster.waitUntil(cliqueValidatorsChanged);
cluster.verify(cliqueValidatorsChanged);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be removed - if we're ditching the "waiting" concept, then no need to ensure miner1 has changed - just ensure all the cluster have in the next line (and thus line 38 can probably go too).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@CjHare CjHare merged commit ab3bd95 into PegaSysEng:master Jun 3, 2019
@CjHare CjHare deleted the at-dsl-removing-waituntil-from-node branch June 3, 2019 05:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants