Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
base repository: NullHypothesis/onionperf
base: master
head repository: NullHypothesis/onionperf
compare: defect/34298
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 0 comments
  • 1 contributor
Commits on May 22, 2020
@NullHypothesis
Update deprecated API attribute of networkx.
57e64f6 
Networkx in version 2.4 announced that the `node` attribute is no longer
supported and one should use `nodes` instead:
<https://networkx.github.io/documentation/stable/release/release_2.4.html>

This patch does exactly that.

This fixes <https://bugs.torproject.org/34298>.
Showing with 2 additions and 2 deletions.
  1. +2 −2 onionperf/model.py
4 onionperf/model.py
View file
@@ -71,7 +71,7 @@ def generate(self):

g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute")
if self.socksproxy is not None:
g.node["start"]["socksproxy"] = self.socksproxy
g.nodes["start"]["socksproxy"] = self.socksproxy
g.add_node("pause", time="5 minutes")
g.add_node("transfer50k", type="get", protocol="tcp", size="50 KiB", timeout="295 seconds", stallout="300 seconds")
g.add_node("transfer1m", type="get", protocol="tcp", size="1 MiB", timeout="1795 seconds", stallout="1800 seconds")
@@ -104,7 +104,7 @@ def generate(self):

g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute")
if self.socksproxy is not None:
g.node["start"]["socksproxy"] = self.socksproxy
g.nodes["start"]["socksproxy"] = self.socksproxy
g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="15 seconds", stallout="10 seconds")

g.add_edge("start", "transfer5m")

No commit comments for this range