commit 3bd7b08d466897fd1697317a9241315a3d27d2b2
author Tim Kilbourn <tkilbourn@google.com> Mon Mar 19 00:06:49 2018 -0700
committer Tim Kilbourn <tkilbourn@google.com> Mon Mar 19 15:17:04 2018 -0700
tree 0b042f439ae9b34b1aaba77bfa640b898d4336e0
parent a7dd40219f5e2d822f740e87bd765de109007150

[wlan][testing] Upgrade test util to use fidl2

Change-Id: I328fed733c55c95bcd22f1252cd098f92eb1908a

drivers/wlan/testing/util/src/main.rs

diff --git a/drivers/wlan/testing/util/src/main.rs b/drivers/wlan/testing/util/src/main.rs
index 9f432e4..4bcf059 100644
--- a/drivers/wlan/testing/util/src/main.rs
+++ b/drivers/wlan/testing/util/src/main.rs
@@ -36,13 +36,12 @@
     OpenOptions::new().read(true).write(true).open(path).map_err(Into::into)
 }
 
-fn get_proxy() -> Result<(async::Executor, wlan::Phy::Proxy), Error> {
+fn get_proxy() -> Result<(async::Executor, wlan::PhyProxy), Error> {
     let executor = async::Executor::new().context("error creating event loop")?;
 
     let phy = wlan_dev::WlanPhy::new(DEV_WLANPHY)?;
     let chan = phy.connect()?;
-    let client_end = fidl::ClientEnd::new(chan);
-    let proxy = wlan::Phy::new_proxy(client_end)?;
+    let proxy = wlan::PhyProxy::new(async::Channel::from_channel(chan)?);
     Ok((executor, proxy))
 }
 
@@ -88,8 +87,8 @@
 
 fn create_wlanintf() -> Result<(), Error> {
     let (mut executor, proxy) = get_proxy()?;
-    let req = wlan::CreateIfaceRequest { role: wlan::MacRole::Client };
-    let fut = proxy.create_iface(req).and_then(|resp| {
+    let mut req = wlan::CreateIfaceRequest { role: wlan::MacRole::Client };
+    let fut = proxy.create_iface(&mut req).and_then(|resp| {
        println!("create results: {:?}", resp);
        Ok(())
     });
@@ -98,8 +97,8 @@
 
 fn destroy_wlanintf(id: u16) -> Result<(), Error> {
     let (mut executor, proxy) = get_proxy()?;
-    let req = wlan::DestroyIfaceRequest { id: id };
-    let fut = proxy.destroy_iface(req).and_then(|resp| {
+    let mut req = wlan::DestroyIfaceRequest { id: id };
+    let fut = proxy.destroy_iface(&mut req).and_then(|resp| {
        println!("destroyed intf {} resp: {:?}", id, resp);
        Ok(())
     });