-
Notifications
You must be signed in to change notification settings - Fork 130
Fixed Difficulty calculator #663
Fixed Difficulty calculator #663
Conversation
700edf4
to
497c6aa
Compare
pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java
Outdated
Show resolved
Hide resolved
17a8293
to
35401ca
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd suggest removing the new AT and supporting infrastructure since dev.json will use the fixed difficulty code anyway and all the ethash tests use dev.json. Otherwise LGTM.
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
public class FixedMiningDifficultyAcceptanceTest extends AcceptanceTestBase { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can just be removed now that dev mode is using the fixed difficulty calculator - pretty much every AT is using it and mining transactions so if it ever breaks they'll all grind to a halt because of the increased difficulty.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed
@@ -0,0 +1,40 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can just use dev.json
now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@@ -120,6 +121,24 @@ public PantheonNode createArchiveNodeWithP2pDisabled(final String name) throws I | |||
.build()); | |||
} | |||
|
|||
public Node createFixedDifficultyMinerNode(final String name) throws IOException { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--network DEV
will be enough to get this now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or I could remove the method since fixed difficulty is being used in tests by default and the fixed difficulty AT has been deleted.
…Mainnet Protocol Schedule.
f671ab6
to
ccf20a0
Compare
* created fixed difficulty calculator. * Use fixed calculator at the right spot. * Use fixeddifficulty in the main dev.json file. * Removed development difficulty calculators.
Fixed difficulty calculator.
Goal is to have a simple replacement in genesis blocks for devmode options currently floating around.