Verified Commit 9af45f67 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'gitlab/merge-requests/9'

parents 7b20f3bf 819a4cb3
Pipeline #40323 passed with stage
in 3 minutes and 28 seconds
Subproject commit 6e9a32a89e8f48c70988d9f5cb0eb27a14b3ebe8 Subproject commit c5d7511a7300dd535d368ccb3390b52bff453534
...@@ -116,7 +116,7 @@ public class ConsensusBuilder { ...@@ -116,7 +116,7 @@ public class ConsensusBuilder {
} }
private String knownFlagsLine = "known-flags Authority BadExit Exit " private String knownFlagsLine = "known-flags Authority BadExit Exit "
+ "Fast Guard HSDir Named Running Stable Unnamed V2Dir Valid"; + "Fast Guard HSDir MiddleOnly Named Running Stable Unnamed V2Dir Valid";
protected static RelayNetworkStatusConsensus protected static RelayNetworkStatusConsensus
createWithKnownFlagsLine(String line) createWithKnownFlagsLine(String line)
......
...@@ -365,6 +365,7 @@ public class RelayNetworkStatusConsensusImplTest { ...@@ -365,6 +365,7 @@ public class RelayNetworkStatusConsensusImplTest {
assertTrue(consensus.getRecommendedServerVersions().contains( assertTrue(consensus.getRecommendedServerVersions().contains(
"0.2.3.8-alpha")); "0.2.3.8-alpha"));
assertTrue(consensus.getKnownFlags().contains("Running")); assertTrue(consensus.getKnownFlags().contains("Running"));
assertTrue(consensus.getKnownFlags().contains("MiddleOnly"));
assertTrue(consensus.getRecommendedClientProtocols().get("Cons") assertTrue(consensus.getRecommendedClientProtocols().get("Cons")
.contains(1L)); .contains(1L));
assertFalse(consensus.getRecommendedRelayProtocols().get("Cons") assertFalse(consensus.getRecommendedRelayProtocols().get("Cons")
...@@ -1636,4 +1637,3 @@ public class RelayNetworkStatusConsensusImplTest { ...@@ -1636,4 +1637,3 @@ public class RelayNetworkStatusConsensusImplTest {
assertEquals(unrecognizedLines, consensus.getUnrecognizedLines()); assertEquals(unrecognizedLines, consensus.getUnrecognizedLines());
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment