Merge pull request #253 from EOSIO/p2p-txnmgnt-180

P2p txnmgnt 180
EOSIO · Aug 29, 2017 · ba749f3 · ba749f3
2 parents 31a76a1 + a7f507f
commit ba749f3
Show file tree

Hide file tree

Showing 7 changed files with 250 additions and 151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,8 @@
 *.wasm
 *.s
 *.dot
-
+\#*
+\.#*
 CMakeCache.txt
 CMakeFiles
 cmake_install.cmake

diff --git a/plugins/net_plugin/include/eos/net_plugin/net_plugin.hpp b/plugins/net_plugin/include/eos/net_plugin/net_plugin.hpp
@@ -19,7 +19,6 @@ namespace eos {
         void plugin_shutdown();
 
         void broadcast_block(const chain::signed_block &sb);
-        void broadcast_transaction (const chain::SignedTransaction &txn);
 
       private:
         std::unique_ptr<class net_plugin_impl> my;

diff --git a/plugins/net_plugin/include/eos/net_plugin/protocol.hpp b/plugins/net_plugin/include/eos/net_plugin/protocol.hpp
@@ -6,7 +6,7 @@ namespace eos {
    using namespace chain;
    using namespace fc;
 
-   struct handshake_message {
+  struct handshake_message {
       int16_t         network_version = 0;
       chain_id_type   chain_id; ///< used to identify chain
       fc::sha256      node_id; ///< used to identify peers and prevent self-connect
@@ -41,7 +41,7 @@ namespace eos {
    };
 
    struct peer_message {
-     vector<fc::ip::endpoint> peers;
+     vector<fc::sha256> peers;
    };
 
    using net_message = static_variant<handshake_message,
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,8 @@ @@
     *.wasm
     *.s
     *.dot
+    \#*
+    \.#*
     CMakeCache.txt
     CMakeFiles
     cmake_install.cmake
@@ Expand Down @@