factors: Get factors tests passing with new spin-core

Signed-off-by: Lann Martin <[email protected]>

crates/factor-variables/build.rs

@@ -1,5 +1,5 @@
 fn main() {
-    println!("cargo::rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=build.rs");
     // Enable spin-factors-derive to emit expanded macro output.
     let out_dir = std::env::var("OUT_DIR").unwrap();
     println!("cargo:rustc-env=SPIN_FACTORS_DERIVE_EXPAND_DIR={out_dir}");

crates/factor-wasi/build.rs

@@ -1,5 +1,5 @@
 fn main() {
-    println!("cargo::rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=build.rs");
     // Enable spin-factors-derive to emit expanded macro output.
     let out_dir = std::env::var("OUT_DIR").unwrap();
     println!("cargo:rustc-env=SPIN_FACTORS_DERIVE_EXPAND_DIR={out_dir}");

crates/factors/tests/smoke.rs

@@ -64,7 +64,7 @@ async fn smoke_test_works() -> anyhow::Result<()> {
         None,
     )
     .await?;
-    let app = App::inert(locked);
+    let app = App::new("test-app", locked);
 
     let engine = wasmtime::Engine::new(wasmtime::Config::new().async_support(true))?;
     let mut linker = wasmtime::component::Linker::new(&engine);

crates/key-value/src/host_component.rs

@@ -56,7 +56,8 @@ impl HostComponent for KeyValueComponent {
     }
 }
 
-impl DynamicHostComponent for KeyValueComponent {
+// impl DynamicHostComponent for KeyValueComponent {
+impl HostComponent for KeyValueComponent {
     fn update_data(&self, data: &mut Self::Data, component: &AppComponent) -> anyhow::Result<()> {
         let key_value_stores = component
             .get_metadata(crate::KEY_VALUE_STORES_KEY)?

crates/key-value/src/lib.rs

@@ -5,10 +5,10 @@ use spin_world::v2::key_value;
 use std::{collections::HashSet, sync::Arc};
 use table::Table;
 
-mod host_component;
+// TODO: Code left for reference; remove after migration to factors
+// mod host_component;
 mod util;
 
-pub use host_component::{manager, KeyValueComponent};
 pub use util::{
     CachingStoreManager, DefaultManagerGetter, DelegatingStoreManager, EmptyStoreManager,
 };

crates/sqlite/src/lib.rs

@@ -1,13 +1,13 @@
-mod host_component;
+// TODO: Code left for reference; remove after migration to factors
+// mod host_component;
 
-use spin_app::{async_trait, MetadataKey};
+use spin_app::MetadataKey;
 use spin_core::wasmtime::component::Resource;
+use spin_world::async_trait;
 use spin_world::v1::sqlite::Error as V1SqliteError;
 use spin_world::v2::sqlite;
 use std::{collections::HashSet, sync::Arc};
 
-pub use host_component::SqliteComponent;
-
 pub const DATABASES_KEY: MetadataKey<HashSet<String>> = MetadataKey::new("databases");
 
 /// A store of connections for all accessible databases for an application

run-factors-tests.sh

@@ -2,4 +2,7 @@
 
 # TODO: Remove after enabling CI for factors branch
 
-cargo test -p '*factor*'
+cargo test \
+	-p spin-core \
+	-p spin-app \
+	-p '*factor*'