diff --git a/itests/tests/test_squeak_node.py b/itests/tests/test_squeak_node.py index b39cf45e..d5ce3862 100644 --- a/itests/tests/test_squeak_node.py +++ b/itests/tests/test_squeak_node.py @@ -23,6 +23,16 @@ from tests.util import squeak_from_msg from tests.util import subtract_tweak +def test_get_network(admin_stub): + # Get the network + get_network_response = admin_stub.GetNetwork( + squeak_admin_pb2.GetNetworkRequest() + ) + network = get_network_response.network + + assert network == "simnet" + + def test_get_profile(server_stub, admin_stub, signing_profile_id): # Get the squeak profile get_squeak_profile_response = admin_stub.GetSqueakProfile( diff --git a/proto/squeak_admin.proto b/proto/squeak_admin.proto index fe91ad4f..d670649c 100644 --- a/proto/squeak_admin.proto +++ b/proto/squeak_admin.proto @@ -192,6 +192,10 @@ service SqueakAdmin { */ rpc SubscribeReceivedPayments (SubscribeReceivedPaymentsRequest) returns (stream ReceivedPayment) {} + /** sqkadmin: `getnetwork` + */ + rpc GetNetwork (GetNetworkRequest) returns (GetNetworkReply) {} + } message CreateSigningProfileRequest { @@ -715,3 +719,11 @@ message SubscribeReceivedPaymentsRequest { /// Payment index to start consuming from int64 payment_index = 1; } + +message GetNetworkRequest { +} + +message GetNetworkReply { + /// The network + string network = 1; +} diff --git a/squeaknode/admin/squeak_admin_server_handler.py b/squeaknode/admin/squeak_admin_server_handler.py index 743b2b68..b4161966 100644 --- a/squeaknode/admin/squeak_admin_server_handler.py +++ b/squeaknode/admin/squeak_admin_server_handler.py @@ -476,3 +476,10 @@ class SqueakAdminServerHandler(object): received_payment_msg = received_payments_to_message( received_payment) yield received_payment_msg + + def handle_get_network(self, request): + logger.info("Handle get network") + network = self.squeak_controller.get_network() + return squeak_admin_pb2.GetNetworkReply( + network=network, + ) diff --git a/squeaknode/admin/squeak_admin_server_servicer.py b/squeaknode/admin/squeak_admin_server_servicer.py index 4d2e1158..f1a49fdf 100644 --- a/squeaknode/admin/squeak_admin_server_servicer.py +++ b/squeaknode/admin/squeak_admin_server_servicer.py @@ -162,6 +162,9 @@ class SqueakAdminServerServicer(squeak_admin_pb2_grpc.SqueakAdminServicer): def SubscribeReceivedPayments(self, request, context): return self.handler.handle_subscribe_received_payments(request) + def GetNetwork(self, request, context): + return self.handler.handle_get_network(request) + def serve(self): server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) squeak_admin_pb2_grpc.add_SqueakAdminServicer_to_server(self, server)