Merge pull request #2424

28b72b6e tx_pool: pre-init tvc.m_verifivation_failed before processing (moneromooo-monero)
50a629b2 core_tests: catch (impossible in practice) tx extra api failure (moneromooo-monero)
fee15ef1 wallet2: catch failure to parse address (moneromooo-monero)
1399e26d net_peerlist: remove dead code (moneromooo-monero)
50e09698 tx_pool: guard against failure getting tx hash (moneromooo-monero)
54cc209a wallet_rpc_server: catch failure to create directory (moneromooo-monero)
3e55099c wallet_rpc_server: init m_vm to NULL in ctor (moneromooo-monero)
7d0dde5e wallet_args: remove redundant default value for --log-file (moneromooo-monero)
ed4a3350 wallet2: catch failure to save keys file (moneromooo-monero)
44434c8a wallet2_api: check whether dynamic_cast returns NULL (moneromooo-monero)
92f2f687 core: check return value from parse_hexstr_to_binbuff (moneromooo-monero)
5475692e wallet2_api: remove an unused, uninitialized, field (moneromooo-monero)
a7ba3de1 libwallet_api_tests: initialize newblock_triggered on reset (moneromooo-monero)
b2763ace wallet2_api: init error code to "no error" in the ctor (moneromooo-monero)
b5faac53 get_blockchain_top now returns void (moneromooo-monero)
2e44d8f2 wallet_rpc_server: guard against exceptions (moneromooo-monero)
4230876b simplewallet: guard against I/O exceptions (moneromooo-monero)
06c1e057 daemon: initialize decode_as_json in RPC request (moneromooo-monero)
11f71af5 http_base: init size_t in http_request_info ctor (moneromooo-monero)

1 files changed, 1 insertions, 20 deletions

diff --git a/src/p2p/net_peerlist.h b/src/p2p/net_peerlist.h
index a30a05422..8372445aa 100644
--- a/src/p2p/net_peerlist.h
+++ b/src/p2p/net_peerlist.h
@@ -190,35 +190,16 @@ namespace nodetool
       if (ver < 6)
         return;
 
-      if(ver < 3)
-        return;
       CRITICAL_REGION_LOCAL(m_peerlist_lock);
-      if(ver < 4)
-      {
-        //loading data from old storage
-        peers_indexed_old pio; 
-        a & pio;
-        peers_indexed_from_old(pio, m_peers_white);
-        return;
-      }
 
 #if 0
       // trouble loading more than one peer, can't find why
       a & m_peers_white;
       a & m_peers_gray;
+      a & m_peers_anchor;
 #else
       serialize_peers(a, m_peers_white, peerlist_entry(), ver);
       serialize_peers(a, m_peers_gray, peerlist_entry(), ver);
-#endif
-
-      if(ver < 5) {
-        return;
-      }
-
-#if 0
-      // trouble loading more than one peer, can't find why
-      a & m_peers_anchor;
-#else
       serialize_peers(a, m_peers_anchor, anchor_peerlist_entry(), ver);
 #endif
     }