KEP-1498 Remove unused http port from options

even more http_port removal
bluzelle · Jun 11, 2019 · 61c3f95 · 61c3f95
1 parent f052733
commit 61c3f95
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/bootstrap/bootstrap_peers.cpp b/bootstrap/bootstrap_peers.cpp
@@ -122,7 +122,7 @@ bootstrap_peers::initialize_peer_list(const Json::Value& root, bzn::peers_list_t
         // peer didn't contain everything we need
         if (host.empty() || port == 0)
         {
-            LOG(warning) << "Ignoring underspecified peer (needs host, port and http_port) " << peer;
+            LOG(warning) << "Ignoring underspecified peer (needs host and port) " << peer;
             continue;
         }
 

diff --git a/bootstrap/test/bootstrap_test.cpp b/bootstrap/test/bootstrap_test.cpp
@@ -22,8 +22,8 @@ namespace
 {
     const std::string invalid_json = "[{\"Some key\": 124}, }}[} oh noes I broke it";
     const std::string no_peers = "[]";
-    const std::string valid_peers = "[{\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345, \"http_port\" : 8080}, {\"host\": \"nonamepeer.com\", \"port\": 54321, \"http_port\" : 8080}]";
-    const std::string duplicate_peers = "[{\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345, \"http_port\" : 8080}, {\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345, \"http_port\" : 8080}]";
+    const std::string valid_peers = "[{\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345, \"http_port\" : 8080}, {\"host\": \"nonamepeer.com\", \"port\": 54321}]";
+    const std::string duplicate_peers = "[{\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345, \"http_port\" : 8080}, {\"name\": \"peer1\", \"host\": \"peer1.com\", \"port\": 12345}]";
     const std::string underspecified_peer = "[{\"name\": \"peer1\", \"port\": 1024}]";
     const std::string bad_port = "[{\"name\": \"peer1\", \"host\": \"127.0.0.1\", \"port\": 70000}]";
     const std::string test_peers_filename = "peers.json";

diff --git a/mocks/mock_options_base.hpp b/mocks/mock_options_base.hpp
@@ -64,8 +64,6 @@ class mock_options_base : public options_base {
       size_t());
   MOCK_CONST_METHOD0(pbft_enabled,
       bool());
-  MOCK_CONST_METHOD0(get_http_port,
-      uint16_t());
   MOCK_CONST_METHOD0(peer_validation_enabled,
       bool());
   MOCK_CONST_METHOD0(get_signed_key,

diff --git a/proto/database.proto b/proto/database.proto
@@ -150,7 +150,6 @@ message database_redirect_response
     string leader_name = 2;
     string leader_host = 3;
     uint32 leader_port = 4;
-    uint32 leader_http_port = 5;
 }
 
 message database_has_response

diff --git a/proto/pbft.proto b/proto/pbft.proto
@@ -111,9 +111,8 @@ message pbft_peer_info
 {
     string host = 1;
     uint32 port = 2;
-    uint32 http_port = 3;
-    string name = 4;
-    string uuid = 5;
+    string name = 3;
+    string uuid = 4;
 }
 
 message prepared_proof