commit e185448deb89d14edb856b5329c7f2593e54e7af Author: iwakeh iwakeh@torproject.org Date: Tue Feb 28 08:27:44 2017 +0000

Update to metrics-lib 1.6.0. --- build.xml | 2 +- .../torproject/onionoo/updater/DummyConsensus.java | 33 ++++++++++++++++++++++ .../onionoo/updater/DummyStatusEntry.java | 5 ++++ 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml index 838df53..f419fa6 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="onionoo.protocol.version" value="3.2"/> <property name="release.version" value="${onionoo.protocol.version}-1.1.0-dev"/> - <property name="descriptorversion" value="1.5.0"/> + <property name="descriptorversion" value="1.6.0"/> <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java b/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java index 9745aa4..6af0b94 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java @@ -130,5 +130,38 @@ public class DummyConsensus implements RelayNetworkStatusConsensus { public List<DirectorySignature> getSignatures() { return null; } + + public int getSharedRandPreviousNumReveals() { + return -1; + } + + public String getSharedRandPreviousValue() { + return null; + } + + public int getSharedRandCurrentNumReveals() { + return -1; + } + + public String getSharedRandCurrentValue() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRecommendedClientProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRecommendedRelayProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRequiredClientProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRequiredRelayProtocols() { + return null; + } + }

diff --git a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java index 9da51fc..7f97581 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java @@ -7,6 +7,7 @@ import org.torproject.descriptor.NetworkStatusEntry;

import java.util.List; import java.util.Set; +import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeSet;

@@ -97,5 +98,9 @@ public class DummyStatusEntry implements NetworkStatusEntry { public String getMasterKeyEd25519() { return null; } + + public SortedMap<String, SortedSet<Long>> getProtocols() { + return null; + } }