From 13c52a20de18ab30ea8c514644a10855a238b4a0 Mon Sep 17 00:00:00 2001 From: rene <41963722+renaynay@users.noreply.github.com> Date: Tue, 4 Feb 2020 20:17:01 +0100 Subject: [PATCH] Decrease Duration (#16) * quorum using static peers generator * Delete permissioned-nodes.json * removed permissioned nodes * removed port mappings from quorum clique as theyre unnecessary * removed count:1 as default is 1 * added quorum besu * changed ethstats secret * latest * nodex --> $NAME * parity yaml close to finished * parity xdai * renamed few things * wait for * nates example * updated md to remove task runners and replaced sleep w wait-for * removed comments * removed db from rpc api * removed db * 120 m instead of 2h for phase duration in quorum clique - was breaking on lint * removed sleep and replaced w/ duration * readme for geth partition * delete btc lightning, accidentally commmitted * removed unnecessary pk3 * basic parity ethereum sample * changed timeout from infinite to 1 hr * duration * remove unnecessary sleep task + replace w duration * removed task from 2nd phase * decrease duration * decrease quorum limit * changes nate requested --- etc/multigeth.yaml | 10 ++-------- gossipsub/gossip.md | 4 ++-- gossipsub/gossip.yaml | 10 +++++----- quorum_clique/quorum_clique.md | 4 ++-- quorum_clique/quorum_clique.yaml | 2 +- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/etc/multigeth.yaml b/etc/multigeth.yaml index dc22d91..c405a0f 100644 --- a/etc/multigeth.yaml +++ b/etc/multigeth.yaml @@ -53,9 +53,6 @@ services: - source-path: ws_secret.json destination-path: /eth-netstats/ws_secret.json task-runners: - - name: wait - script: - inline: sleep 1800 - name: geth-staticpeers-helper description: will gather the IP addresses and generate a static peers file. image: "gcr.io/whiteblock/helpers/besu/staticpeers:master" @@ -79,6 +76,7 @@ tests: timeout: 3 m - name: start description: start the remaining node(s) + duration: 10 m system: - name: multigeth_boot_node type: multigeth_boot_node @@ -99,8 +97,4 @@ tests: - "80:3000" resources: networks: - - name: common-network - - name: wait - tasks: - - type: wait - timeout: 1800 s \ No newline at end of file + - name: common-network \ No newline at end of file diff --git a/gossipsub/gossip.md b/gossipsub/gossip.md index 53e435c..4bf1764 100644 --- a/gossipsub/gossip.md +++ b/gossipsub/gossip.md @@ -25,9 +25,9 @@ Gives Gossipsub nodes 15 seconds to start up Creates a pseudo-randomly generated list of peers for gossipnodes to connect to and generate a deterministic network topology ### run -Runs the testnetwork for 12.5 minutes (750 s) +Runs the testnetwork for 15 minutes ## Tests ### gossip-load-test -Runs a gossipsub network and sends messages for 12.5 minutes (750 s) \ No newline at end of file +Runs a gossipsub network and sends messages for 15 minutes \ No newline at end of file diff --git a/gossipsub/gossip.yaml b/gossipsub/gossip.yaml index be94e30..29f4dea 100644 --- a/gossipsub/gossip.yaml +++ b/gossipsub/gossip.yaml @@ -151,27 +151,27 @@ tests: - name: gossip-node1 type: gossip-node1 count: 1 - resources: + resources: networks: - name: gossip-network - name: gossip-node2 type: gossip-node2 count: 1 - resources: + resources: networks: - name: gossip-network - name: gossip-node3 type: gossip-node3 count: 1 - resources: + resources: networks: - name: gossip-network - name: start-orchestra # add in orchestra node - duration: 60 m + duration: 15 m system: - name: orchestra-node type: orchestra-node count: 1 - resources: + resources: networks: - name: gossip-network diff --git a/quorum_clique/quorum_clique.md b/quorum_clique/quorum_clique.md index 6713245..5ae34e2 100644 --- a/quorum_clique/quorum_clique.md +++ b/quorum_clique/quorum_clique.md @@ -13,10 +13,10 @@ Service to check the usage, performance and overall state of an Ethereum network ## Tasks ### testnet-expiration -Requires testnet to run for 2 hours. +Requires testnet to run for 10 minutes. ## Tests | Phase | Duration | Description | |--------------|------------|---------------------------------------------------------------------| -| Testnet | 2 hours | Run 7 Quorum Geth nodes and Ethstats service for 2 hours on a testnet with no latency or packet loss | +| Testnet | 10 minutes| Run 7 Quorum Geth nodes and Ethstats service on a testnet with no latency or packet loss | diff --git a/quorum_clique/quorum_clique.yaml b/quorum_clique/quorum_clique.yaml index 8ac808a..3df4f34 100644 --- a/quorum_clique/quorum_clique.yaml +++ b/quorum_clique/quorum_clique.yaml @@ -44,7 +44,7 @@ tests: tasks: - type: static-peers - name: start-quorum - duration: 120 m + duration: 15 m system: - type: Quorum count: 7