test fixes

Author: pchickey

src/test.rs

@@ -14,7 +14,7 @@ use {
         component::{Component, InstancePre, Linker, ResourceTable},
         Config, Engine, Store,
     },
-    wasmtime_wasi::{WasiCtx, WasiCtxBuilder},
+    wasmtime_wasi::p2::{WasiCtx, WasiCtxBuilder},
 };
 
 mod echoes;

src/test/echoes.rs

@@ -4,7 +4,7 @@ use {
     once_cell::sync::Lazy,
     proptest::strategy::{Just, Strategy},
     wasmtime::{
-        component::{InstancePre, Linker},
+        component::{HasSelf, InstancePre, Linker},
         Store,
     },
 };
@@ -189,8 +189,8 @@ impl super::Host for Host {
     type World = EchoesTest;
 
     fn add_to_linker(linker: &mut Linker<Ctx>) -> Result<()> {
-        wasmtime_wasi::add_to_linker_async(&mut *linker)?;
-        componentize_py::test::echoes::add_to_linker(linker, |ctx| ctx)?;
+        wasmtime_wasi::p2::add_to_linker_async(&mut *linker)?;
+        componentize_py::test::echoes::add_to_linker::<_, HasSelf<_>>(linker, |ctx| ctx)?;
         Ok(())
     }
 

src/test/tests.rs

@@ -6,10 +6,13 @@ use {
     once_cell::sync::Lazy,
     std::str,
     wasmtime::{
-        component::{InstancePre, Linker, Resource, ResourceAny},
+        component::{HasSelf, InstancePre, Linker, Resource, ResourceAny},
         Store,
     },
-    wasmtime_wasi::{DirPerms, FilePerms, IoView, WasiCtxBuilder},
+    wasmtime_wasi::{
+        p2::{IoView, WasiCtxBuilder},
+        DirPerms, FilePerms,
+    },
 };
 
 wasmtime::component::bindgen!({
@@ -93,9 +96,9 @@ impl super::Host for Host {
     type World = Tests;
 
     fn add_to_linker(linker: &mut Linker<Ctx>) -> Result<()> {
-        wasmtime_wasi::add_to_linker_async(linker)?;
-        Tests::add_to_linker(linker, |ctx| ctx)?;
-        foo_sdk::FooWorld::add_to_linker(linker, |ctx| ctx)?;
+        wasmtime_wasi::p2::add_to_linker_async(linker)?;
+        Tests::add_to_linker::<_, HasSelf<_>>(linker, |ctx| ctx)?;
+        foo_sdk::FooWorld::add_to_linker::<_, HasSelf<_>>(linker, |ctx| ctx)?;
         Ok(())
     }
 

test-generator/src/lib.rs

@@ -699,7 +699,7 @@ pub fn generate() -> Result<()> {
 
             writeln!(
                 &mut typed_function_inits,
-                r#"echo{test_index}: instance.get_typed_func::<({params}), ({result_type},)>(&mut *store, component.export_index(Some(&index), "echo{test_index}").unwrap().1)?,"#
+                r#"echo{test_index}: instance.get_typed_func::<({params}), ({result_type},)>(&mut *store, component.get_export_index(Some(&index), "echo{test_index}").unwrap())?,"#
             )
             .unwrap();
         }
@@ -802,7 +802,7 @@ use {{
     once_cell::sync::Lazy,
     proptest::strategy::{{Just, Strategy}},
     wasmtime::{{
-        component::{{Instance, InstancePre, Linker, TypedFunc}},
+        component::{{Instance, InstancePre, Linker, TypedFunc, HasSelf}},
         Store,
     }},
 }};
@@ -828,8 +828,8 @@ impl super::Host for Host {{
     type World = Exports;
 
     fn add_to_linker(linker: &mut Linker<Ctx>) -> Result<()> {{
-        wasmtime_wasi::add_to_linker_async(&mut *linker)?;
-        {PREFIX}::add_to_linker(linker, |ctx| ctx)?;
+        wasmtime_wasi::p2::add_to_linker_async(&mut *linker)?;
+        {PREFIX}::add_to_linker::<_, HasSelf<_>>(linker, |ctx| ctx)?;
         Ok(())
     }}
 
@@ -838,7 +838,7 @@ impl super::Host for Host {{
         pre: InstancePre<Ctx>,
     ) -> Result<Self::World> {{
         let component = pre.component();
-        let (_, index) = component.export_index(None, "componentize-py:test/echoes-generated").unwrap();
+        let index = component.get_export_index(None, "componentize-py:test/echoes-generated").unwrap();
         let instance = pre.instantiate_async(&mut *store).await?;
         Ok((Self::World {{
            {typed_function_inits}