Config update

Signed-off-by: Mark Terry <mark.terry@consensys.net>
hyperledger · Feb 14, 2021 · 4f17898 · 4f17898
1 parent b9efb68
commit 4f17898
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/...ner-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java b/...ner-tests/tests/src/test/java/org/hyperledger/besu/tests/container/ContainerTestBase.java
@@ -31,6 +31,7 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.startupcheck.MinimumDurationRunningStartupCheckStrategy;
+import org.testcontainers.utility.MountableFile;
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.http.HttpService;
 
@@ -161,8 +162,8 @@ private GenericContainer buildGoQuorumContainer(
         .withNetwork(containerNetwork)
         .dependsOn(besuContainer, tesseraGoQuorumContainer)
         .withExposedPorts(goQuorumRpcPort, goQuorumP2pPort)
-        .withClasspathResourceMapping(
-            "/goQuorum/qdata", goQuorumContainerDatadir, BindMode.READ_WRITE)
+        .withCopyFileToContainer(
+            MountableFile.forClasspathResource("/goQuorum/qdata"), goQuorumContainerDatadir)
         .withClasspathResourceMapping(ipcPath, ipcBindDir, BindMode.READ_WRITE)
         .withEnv("PRIVATE_CONFIG", containerIpcPath)
         .withCommand(
@@ -181,8 +182,10 @@ private GenericContainer buildGoQuorumContainer(
             "--port",
             goQuorumP2pPort.toString(),
             "--verbosity",
-            "5",
-            "--nousb")
+            "3",
+            "--nousb",
+            "--nodekey",
+            goQuorumContainerDatadir + "/nodeKey")
         .withStartupCheckStrategy(
             new MinimumDurationRunningStartupCheckStrategy(Duration.ofSeconds(10)));
   }

diff --git a/container-tests/tests/src/test/resources/goQuorum/qdata/geth/chaindata/LOG b/container-tests/tests/src/test/resources/goQuorum/qdata/geth/chaindata/LOG
@@ -1,8 +1,8 @@
-=============== Feb 3, 2021 (AEST) ===============
-16:47:07.638401 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-16:47:07.660530 db@open opening
-16:47:07.670436 version@stat F·[] S·0B[] Sc·[]
-16:47:07.678106 db@janitor F·2 G·0
-16:47:07.680935 db@open done T·11.66989ms
-16:47:07.683665 db@close closing
-16:47:07.683780 db@close done T·114.273µs
+=============== Feb 14, 2021 (AEST) ===============
+23:14:40.884025 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
+23:14:40.903422 db@open opening
+23:14:40.908575 version@stat F·[] S·0B[] Sc·[]
+23:14:40.925362 db@janitor F·2 G·0
+23:14:40.928734 db@open done T·21.570473ms
+23:14:40.931679 db@close closing
+23:14:40.931776 db@close done T·96.123µs
diff --git a/container-tests/tests/src/test/resources/goQuorum/qdata/geth/lightchaindata/LOG b/container-tests/tests/src/test/resources/goQuorum/qdata/geth/lightchaindata/LOG
@@ -1,8 +1,8 @@
-=============== Feb 3, 2021 (AEST) ===============
-16:47:07.684195 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
-16:47:07.697905 db@open opening
-16:47:07.702354 version@stat F·[] S·0B[] Sc·[]
-16:47:07.706377 db@janitor F·2 G·0
-16:47:07.709121 db@open done T·7.29551ms
-16:47:07.709700 db@close closing
-16:47:07.709815 db@close done T·113.934µs
+=============== Feb 14, 2021 (AEST) ===============
+23:14:40.932506 log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed
+23:14:40.943314 db@open opening
+23:14:40.946979 version@stat F·[] S·0B[] Sc·[]
+23:14:40.951171 db@janitor F·2 G·0
+23:14:40.956883 db@open done T·10.713343ms
+23:14:40.957782 db@close closing
+23:14:40.957945 db@close done T·162.042µs
diff --git a/container-tests/tests/src/test/resources/goQuorum/qdata/nodeKey b/container-tests/tests/src/test/resources/goQuorum/qdata/nodeKey
@@ -0,0 +1 @@
+32a1f4e055ed34ea5e29361e232653d94229316a71dcbb56aeca4a2c22cbf4c7
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		32a1f4e055ed34ea5e29361e232653d94229316a71dcbb56aeca4a2c22cbf4c7