KEP-915 Status response should be within a bzn_envelope

bluzelle · Dec 17, 2018 · 472e6fd · 472e6fd
1 parent 46f7543
commit 472e6fd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/proto/bluzelle.proto b/proto/bluzelle.proto
@@ -32,6 +32,7 @@ message bzn_envelope
         bytes pbft = 15;
         bytes pbft_membership = 16;
         bytes status_request = 17;
+        bytes status_response = 18;
     }
 }
 

diff --git a/status/status.cpp b/status/status.cpp
@@ -133,5 +133,10 @@ status::handle_status_request_message(const bzn_envelope& /*msg*/, std::shared_p
 
     LOG(debug) << srm.DebugString().substr(0, MAX_MESSAGE_SIZE);
 
-    session->send_message(std::make_shared<bzn::encoded_message>(srm.SerializeAsString()), false);
+    bzn_envelope env;
+    env.set_status_response(srm.SerializeAsString());
+    env.set_sender("placeholder for daemon's uuid"); // TODO
+    // TODO: crypto
+
+    session->send_message(std::make_shared<bzn::encoded_message>(env.SerializeAsString()), false);
 }
diff --git a/status/test/status_test.cpp b/status/test/status_test.cpp
@@ -122,9 +122,13 @@ TEST(status_test, test_that_status_request_queries_status_providers)
     EXPECT_CALL(*mock_session, send_message(An<std::shared_ptr<bzn::encoded_message>>(), false)).WillOnce(Invoke(
         [&](std::shared_ptr<bzn::encoded_message> msg, bool)
         {
-            status_response sr;
+            bzn_envelope env;
+
+            ASSERT_TRUE(env.ParseFromString(*msg));
+            ASSERT_EQ(env.payload_case(), bzn_envelope::kStatusResponse);
 
-            ASSERT_TRUE(sr.ParseFromString(*msg));
+            status_response sr;
+            ASSERT_TRUE(sr.ParseFromString(env.status_response()));
             ASSERT_TRUE(sr.pbft_enabled());
             ASSERT_EQ(sr.swarm_version(), SWARM_VERSION);
             ASSERT_EQ(sr.swarm_git_commit(), SWARM_GIT_COMMIT);