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

Rename ibftrevised to ibft2 #722

Merged
merged 10 commits into from
Feb 1, 2019

Conversation

jframe
Copy link
Contributor

@jframe jframe commented Jan 31, 2019

PR description

Rename IBFT 2.0 config section from revisedibft to ibft2.

Fixed Issue(s)

@jframe jframe requested review from CjHare and rain-on January 31, 2019 00:04
Copy link
Contributor

@CjHare CjHare left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -21,15 +21,15 @@

boolean isIbft();

boolean isRevisedIbft();
boolean isIbft2();
Copy link
Contributor

Choose a reason for hiding this comment

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

don't love that this is only 1 character different from isIbft

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure what to do about that. The name is ibft 2. Thought perhaps could make the old version ibftLegacy in the method names?

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. renamed old ibft methods to ibftLegacy to distinguish from ibft2


boolean isClique();

IbftConfigOptions getIbftConfigOptions();

CliqueConfigOptions getCliqueConfigOptions();

IbftConfigOptions getRevisedIbftConfigOptions();
IbftConfigOptions getIbft2ConfigOptions();
Copy link
Contributor

Choose a reason for hiding this comment

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

as above.

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. as above

@@ -21,7 +21,7 @@

private static final String ETHASH_CONFIG_KEY = "ethash";
private static final String IBFT_CONFIG_KEY = "ibft";
private static final String REVISED_IBFT_CONFIG_KEY = "revisedibft";
private static final String REVISED_IBFT_CONFIG_KEY = "ibft2";
Copy link
Contributor

Choose a reason for hiding this comment

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

probably should change the constant name (replace "Revised" with something else)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep the constant should renamed as well

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

@jframe jframe merged commit 939135c into PegaSysEng:master Feb 1, 2019
@jframe jframe deleted the rename_ibftrevised_to_ibft2 branch February 1, 2019 04:32
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