fix build issues #1

Author: randhid

src/viam/sdk/services/private/discovery_client.cpp

@@ -9,7 +9,7 @@ namespace viam {
 namespace sdk {
 namespace impl {
 
-DiscoveryClient::DiscoveryClient(std::string name std::shared_ptr<grpc::Channel> channel)
+DiscoveryClient::DiscoveryClient(std::string name, std::shared_ptr<grpc::Channel> channel)
     : Discovery(std::move(name)),
       stub_(viam::service::discovery::v1::DiscoveryService::NewStub(channel)),
       channel_(std::move(channel)) {}
@@ -20,7 +20,7 @@ std::vector<ResourceConfig> DiscoveryClient::discover_resources(const ProtoStruc
         .invoke([](auto& response) { return from_proto(response); });
 }
 
-ProtoStruct DiscoveryClient::do_command(const ProtoStruct& extra) {
+ProtoStruct DiscoveryClient::do_command(const ProtoStruct& command) {
     return make_client_helper(this, *stub_, &StubType::DoCommand)
         .with([&](auto& request) { *request.mutable_command() = to_proto(command); })
         .invoke([](auto& response) { return from_proto(response.result()); });

src/viam/sdk/services/private/discovery_client.hpp

@@ -24,10 +24,6 @@ class DiscoveryClient : public Discovery {
     std::vector<ResourceConfig> discover_resources(const ProtoStruct& extra) override;
     ProtoStruct do_command(const ProtoStruct& command) override;
 
-    // Using declarations to introduce convenience overloads of interface which do not need to be
-    // passed the ProtoStruct parameter.
-    using Discovery::discover_resources;
-
    private:
     using StubType = viam::service::discovery::v1::DiscoveryService::StubInterface;
     std::unique_ptr<StubType> stub_;

src/viam/sdk/services/private/discovery_server.hpp

@@ -30,11 +30,10 @@ class DiscoveryServer : public ResourceServer,
         ::grpc::ServerContext* context,
         const ::viam::service::discovery::v1::DiscoverResourcesRequest* request,
         ::viam::service::discovery::v1::DiscoverResourcesResponse* response) noexcept override;
-
     ::grpc::Status DoCommand(
         ::grpc::ServerContext* context,
-        const ::viam::service::discovery::v1::DoCommandRequest* request,
-        ::viam::service::discovery::v1::DoCommandResponse* response) noexcept override;
+        const ::viam::common::v1::DoCommandRequest* request,
+        ::viam::common::v1::DoCommandResponse* response) noexcept override;
 };
 
 }  // namespace impl