Merge pull request #3725

9cc0d42 connection_context: remove state_ prefix from state names (moneromooo-monero)
d9d002c daemon: print peer state in sync_info (moneromooo-monero)

src/cryptonote_basic/connection_context.h

@@ -67,15 +67,15 @@ namespace cryptonote
     switch (s)
     {
     case cryptonote_connection_context::state_before_handshake:
-      return "state_before_handshake";
+      return "before_handshake";
     case cryptonote_connection_context::state_synchronizing:
-      return "state_synchronizing";
+      return "synchronizing";
     case cryptonote_connection_context::state_standby:
-      return "state_standby";
+      return "standby";
     case cryptonote_connection_context::state_idle:
-      return "state_idle";
+      return "idle";
     case cryptonote_connection_context::state_normal:
-      return "state_normal";
+      return "normal";
     default:
       return "unknown";
     }    

src/daemon/rpc_command_executor.cpp

@@ -1895,7 +1895,7 @@ bool t_rpc_command_executor::sync_info()
       for (const auto &s: res.spans)
         if (s.rate > 0.0f && s.connection_id == p.info.connection_id)
           nblocks += s.nblocks, size += s.size;
-      tools::success_msg_writer() << address << "  " << epee::string_tools::pad_string(p.info.peer_id, 16, '0', true) << "  " << p.info.height << "  "  << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued";
+      tools::success_msg_writer() << address << "  " << epee::string_tools::pad_string(p.info.peer_id, 16, '0', true) << "  " << epee::string_tools::pad_string(p.info.state, 16) << "  " << p.info.height << "  "  << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued";
     }
 
     uint64_t total_size = 0;