simplify further

1 files changed, 2 insertions, 5 deletions

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 30d92b2728..0d3f9d87f2 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1453,7 +1453,6 @@ int
 connection_or_client_learned_peer_id(or_connection_t *conn,
                                      const uint8_t *peer_id)
 {
-  int as_expected = 1;
   const or_options_t *options = get_options();
   int severity = server_mode(options) ? LOG_PROTOCOL_WARN : LOG_WARN;
 
@@ -1492,14 +1491,12 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
       control_event_bootstrap_problem(
                                 "Unexpected identity in router certificate",
                                 END_OR_CONN_REASON_OR_IDENTITY);
-    as_expected = 0;
+    return -1;
   }
   if (authdir_mode_tests_reachability(options)) {
     dirserv_orconn_tls_done(conn->_base.address, conn->_base.port,
-                            (const char*)peer_id, as_expected);
+                            (const char*)peer_id);
   }
-  if (!as_expected)
-    return -1;
 
   return 0;
 }