Remove and undo some changes for github diffs

src/cryptonote_basic/account.cpp

@@ -54,6 +54,7 @@ DISABLE_VS_WARNINGS(4244 4345)
 
   namespace cryptonote
 {
+
   //-----------------------------------------------------------------
   hw::device& account_keys::get_device() const  {
     return *m_device;
@@ -182,7 +183,6 @@ DISABLE_VS_WARNINGS(4244 4345)
     {
       m_creation_timestamp = time(NULL);
     }
-
     return first;
   }
   //-----------------------------------------------------------------
@@ -203,7 +203,6 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_creation_timestamp = mktime(&timestamp);
     if (m_creation_timestamp == (uint64_t)-1) // failure
       m_creation_timestamp = 0; // lowest value
-
   }
 
   //-----------------------------------------------------------------
@@ -238,7 +237,6 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_creation_timestamp = mktime(&timestamp);
     if (m_creation_timestamp == (uint64_t)-1) // failure
       m_creation_timestamp = 0; // lowest value
-
   }
 
   //-----------------------------------------------------------------
@@ -255,8 +253,7 @@ DISABLE_VS_WARNINGS(4244 4345)
     m_keys.m_view_secret_key = view_secret_key;
     m_keys.m_spend_secret_key = spend_secret_key;
     m_keys.m_multisig_keys = multisig_keys;
-    bool result = crypto::secret_key_to_public_key(view_secret_key, m_keys.m_account_address.m_view_public_key);
-    return result;
+    return crypto::secret_key_to_public_key(view_secret_key, m_keys.m_account_address.m_view_public_key);
   }
   //-----------------------------------------------------------------
   void account_base::finalize_multisig(const crypto::public_key &spend_public_key)

src/cryptonote_basic/cryptonote_format_utils.cpp

@@ -45,13 +45,6 @@
 #include "cryptonote_core/service_node_voting.h"
 #include "cryptonote_core/loki_name_system.h"
 
-#include <boost/endian/conversion.hpp>
-
-extern "C"
-{
-#include <sodium.h>
-};
-
 using namespace epee;
 
 #undef LOKI_DEFAULT_LOG_CATEGORY

src/cryptonote_basic/tx_extra.h

@@ -35,6 +35,8 @@
 #include "serialization/variant.h"
 #include "crypto/crypto.h"
 #include <boost/variant.hpp>
+
+
 #define TX_EXTRA_PADDING_MAX_COUNT              255
 #define TX_EXTRA_NONCE_MAX_COUNT                255
 

src/cryptonote_core/service_node_list.h

@@ -489,7 +489,6 @@ namespace service_nodes
           const service_node_keys *my_keys);
       bool process_key_image_unlock_tx(cryptonote::network_type nettype, uint64_t block_height, const cryptonote::transaction &tx);
       block_winner get_block_winner() const;
-
     };
 
     // Can be set to true (via --dev-allow-local-ips) for debugging a new testnet on a local private network.

src/simplewallet/simplewallet.cpp

@@ -8874,7 +8874,6 @@ bool simple_wallet::print_address(const std::vector<std::string> &args/* = std::
       [this, &index](const tools::wallet2::transfer_details& td) {
         return td.m_subaddr_index == cryptonote::subaddress_index{ m_current_subaddress_account, index };
       }) != transfers.end();
-
     success_msg_writer() << index << "  " << m_wallet->get_subaddress_as_str({m_current_subaddress_account, index}) << "  " << (index == 0 ? tr("Primary address") : m_wallet->get_subaddress_label({m_current_subaddress_account, index})) << " " << (used ? tr("(used)") : "");
   };
 

src/wallet/wallet2.h

@@ -65,7 +65,6 @@
 #include "node_rpc_proxy.h"
 #include "message_store.h"
 #include "wallet_light_rpc.h"
-#include "cryptonote_core/loki_name_system.h"
 
 #include "common/loki_integration_test_hooks.h"