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

Update IbftConfig Fields #422

Merged
merged 8 commits into from
Dec 16, 2018
Merged

Conversation

rain-on
Copy link
Contributor

@rain-on rain-on commented Dec 14, 2018

The RequestTimeout field in the IbftConfig has been updated to be
"RequestTimeoutSeconds".

The RequestTimeout field in the IbftConfig has been updated to be
"RequestTimeoutSeconds".
public int getRequestTimeoutMillis() {
return ibftConfigRoot.getInteger("requesttimeout", DEFAULT_ROUND_EXPIRY_MILLISECONDS);
public int getRequestTimeoutSeconds() {
return ibftConfigRoot.getInteger("requesttimeoutseconds", DEFAULT_ROUND_EXPIRY_MILLISECONDS);
Copy link
Contributor

Choose a reason for hiding this comment

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

still got DEFAULT_ROUND_EXPIRY_MILLISECONDS while we're now talking about seconds

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops. Done.

@@ -187,7 +187,7 @@

final IbftStateMachine ibftStateMachine = new IbftStateMachine(blockCreatorFactory);
final IbftProcessor ibftProcessor =
new IbftProcessor(ibftEventQueue, ibftConfig.getRequestTimeoutMillis(), ibftStateMachine);
new IbftProcessor(ibftEventQueue, ibftConfig.getRequestTimeoutSeconds(), ibftStateMachine);
Copy link
Contributor

Choose a reason for hiding this comment

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

Far side of this call is still referring to it's parameter as millis

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.

@@ -36,7 +36,7 @@ public int getBlockPeriodSeconds() {
return ibftConfigRoot.getInteger("blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS);
}

public int getRequestTimeoutMillis() {
return ibftConfigRoot.getInteger("requesttimeout", DEFAULT_ROUND_EXPIRY_MILLISECONDS);
public int getRequestTimeoutSeconds() {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the name requestTimeout doesn't really indicate what it is for. Some mention of the round in name would be good. Perhaps something like initialRoundTimeoutSeconds

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree, but can we worry about this one next, don't want to stray TOO far right now.

@rain-on rain-on merged commit 391122b into PegaSysEng:master Dec 16, 2018
@rain-on rain-on deleted the ibft_config_seconds branch January 16, 2019 21:36
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