Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"container-tests" module. #1894

Merged
merged 14 commits into from
Apr 14, 2021
Merged

"container-tests" module. #1894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
43044b3
Added container tests - squash merge master.
mark-terry Mar 30, 2021
93c143b
Dependency version bump and CI config update.
mark-terry Mar 30, 2021
cabbd02
Revert CI config change.
mark-terry Mar 30, 2021
15472be
CI tweaks.
mark-terry Mar 31, 2021
f3a4097
Reverted web3j versions.
mark-terry Mar 31, 2021
30ee7d1
Merge branch 'master' into container-tests
mark-terry Mar 31, 2021
7cf109e
CI change.
mark-terry Mar 31, 2021
d01874a
Merge branch 'master' into container-tests
mark-terry Mar 31, 2021
4bbefa7
Updated Besu image to use build artifact.
mark-terry Apr 1, 2021
7ff20d7
Fixed build dependsOn.
mark-terry Apr 1, 2021
ebe8586
PR fixes.
mark-terry Apr 7, 2021
59193e0
Merge branch 'master' into container-tests
mark-terry Apr 8, 2021
17f7dc9
Merge branch 'master' into container-tests
mark-terry Apr 11, 2021
1058d64
Merge branch 'master' into container-tests
mark-terry Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR fixes. 
Signed-off-by: Mark Terry <mark.terry@consensys.net>
  • Loading branch information
@mark-terry
mark-terry committed Apr 7, 2021
commit ebe8586911529114fa000345626fd839c3701cdd
4 changes: 1 addition & 3 deletions ...ner-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ public class ContainerTestBase {
private final String goQuorumVersion = "21.1.0";
private final String tesseraVersion = "21.1.0";

protected final int defaultWait = 10;

protected final String goQuorumTesseraPubKey = "3XGBIf+x8IdVQOVfIsbRnHwTYOJP/Fx84G8gMmy8qDM=";
protected final String besuTesseraPubKey = "8JJLEAbq6o9m4Kqm++v0Y1n9Z2ryAFtZTyhnxSKWgws=";

Expand Down Expand Up @@ -169,7 +167,7 @@ private GenericContainer buildBesuContainer() {
"--rpc-http-port",
besuRpcPort.toString(),
"--rpc-http-api",
"ADMIN,ETH,NET,WEB3,PRIV,GOQUORUM",
"ADMIN,ETH,NET,WEB3,GOQUORUM",
"--goquorum-compatibility-enabled",
"--min-gas-price",
"0",
Expand Down
6 changes: 0 additions & 6 deletions container-tests/tests/src/test/resources/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
"period": 2,
"epoch": 30000
},
"maxCodeSizeConfig": [
{
"block": 0,
"size": 35
}
],
"isQuorum": true
},
"coinbase":"0x0000000000000000000000000000000000000000",
Expand Down