Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfda6352 authored by Krzysztof Kosiński's avatar Krzysztof Kosiński
Browse files

Update Rust code to grpcio 0.12.1 API. 

Bug: 279548314
Test: atest bluetooth_with_facades.test bt_topshim_facade.test
Change-Id: I72d4b3e819491f2026f210c1c33d426ea00cfabc
parent d395be0f

system/gd/rust/facade/src/lib.rs

+4 −1
Original line number Diff line number Diff line
@@ -88,12 +88,15 @@ impl FacadeServer { 
        }



        let env = Arc::new(Environment::new(2));

        let mut builder = ServerBuilder::new(env).bind("0.0.0.0", grpc_port);

        let mut builder = ServerBuilder::new(env);

        for service in services {

            builder = builder.register_service(service);

        }



        let mut server = builder.build().unwrap();

        let addr = format!("0.0.0.0:{}", grpc_port);

        let creds = ServerCredentials::insecure();

        server.add_listening_port(addr, creds).unwrap();

        server.start();



        Self { server, stack }

system/gd/rust/facade/src/main.rs

+3 −1
Original line number Diff line number Diff line
@@ -61,9 +61,11 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) { 
            rootcanal_port,

            matches.get_one::<String>("btsnoop").cloned(),

        ))

        .bind("0.0.0.0", root_server_port)

        .build()

        .unwrap();

    let addr = format!("0.0.0.0:{}", root_server_port);

    let creds = ServerCredentials::insecure();

    server.add_listening_port(addr, creds).unwrap();

    server.start();



    sigint.next().await;

system/gd/rust/topshim/facade/src/main.rs

+3 −1
Original line number Diff line number Diff line
@@ -114,9 +114,11 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) { 
        .register_service(hf_client_service_impl)

        .register_service(hfp_service_impl)

        .register_service(media_service_impl)

        .bind("0.0.0.0", grpc_port)

        .build()

        .unwrap();

    let addr = format!("0.0.0.0:{}", grpc_port);

    let creds = ServerCredentials::insecure();

    server.add_listening_port(addr, creds).unwrap();

    server.start();



    sigint.next().await;