@crowdedkingdoms/ckx-kit 0.1.0-dev.1 → 0.2.0-dev.1

package/kit.pin

@@ -1,9 +1,9 @@
 # The platform toolchain release this kit was copied from (sync-kit.sh in the platform's
 # repository). The paths in `copied` are byte-identical to it: change them there, never here.
-toolchain_version=v1.9.0
-toolchain_commit=8b4ef8929c4fd1bb7ccf604032ad75b970aca1a2
-sdk_commit=b4194c7a13e2f3b74279cb4f715c4bcdaba70023
-ckx_sdk_version=0.8.0
+toolchain_version=v1.10.1
+toolchain_commit=718763af61dd6b775bae731566130732901b6902
+sdk_commit=4aa2af5aa86c3b1d90ed7eb10f65a0fcd14a1387
+ckx_sdk_version=0.9.0
 crowdy_client_sdk_version=0.1.0
 rust_version=1.97.1
 copied=crates/ckx-sdk/src crates/crowdy-client-sdk/src tools/instrument/Cargo.toml tools/instrument/Cargo.lock tools/instrument/src checks/src/build/exec-source.ts checks/src/build/exec-source.spec.ts checks/src/build/rust-source-guard.ts checks/src/build/rust-source-guard.spec.ts checks/src/build/wasm-inspect.ts checks/src/build/wasm-inspect.spec.ts checks/src/build/client-capabilities.ts checks/src/build/client-capabilities.spec.ts checks/src/test-support/wasm-module.ts checks/compute-toolchain/host-catalog.json starters rust-toolchain.toml vendor.lock

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@crowdedkingdoms/ckx-kit",
-  "version": "0.1.0-dev.1",
+  "version": "0.2.0-dev.1",
   "description": "Build, check and test Crowded Kingdoms ck-exec mods, hubs and spokes on your machine, as the platform builds them",
   "license": "MIT OR Apache-2.0",
   "homepage": "https://docs.crowdedkingdoms.com/exec/intro",
   "repository": {
     "type": "git",
-    "url": "https://github.com/CrowdedKingdoms/ckx-kit.git"
+    "url": "git+https://github.com/CrowdedKingdoms/ckx-kit.git"
   },
   "bugs": "https://github.com/CrowdedKingdoms/ckx-kit/issues",
   "keywords": [

package/starters/grid-mod/Cargo.toml

@@ -9,5 +9,5 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-ckx-sdk = "0.8.0"
+ckx-sdk = "0.9.0"
 serde = { version = "1", features = ["derive"] }

package/starters/grid-mod/src/lib.rs

@@ -70,8 +70,31 @@ ckx_sdk::export_hub!(GridMod);
 
 #[cfg(test)]
 mod tests {
+    use ckx_sdk::testing::{FakeGrid, TestHub};
+
     use super::*;
 
+    #[test]
+    fn visitors_are_welcomed_and_the_mod_reaches_no_other_node() {
+        let grid = FakeGrid::new(7, ChunkPos::new(0, 0, 0), ChunkPos::new(3, 1, 3), 42);
+        let mut m = TestHub::<GridMod>::mod_on("grid-mod", grid).unwrap();
+        let hello: String = m.call_typed(Caller::Player(9), "visit", &()).unwrap();
+        assert_eq!(hello, "welcome to grid 7, visitor 1");
+        let refusal: Option<String> = m.call_typed(Caller::Player(9), "probe", &()).unwrap();
+        assert_eq!(refusal.as_deref(), Some("Denied: `mod:grid-mod` may not call `world`"));
+        assert_eq!(m.call(Caller::Instance(1), "visit", &[]).unwrap_err().status, Status::Denied, "only players call mods");
+    }
+
+    #[test]
+    fn world_events_are_kept_across_a_restart() {
+        let grid = FakeGrid::new(7, ChunkPos::new(0, 0, 0), ChunkPos::new(3, 1, 3), 42);
+        let mut m = TestHub::<GridMod>::mod_on("grid-mod", grid).unwrap();
+        m.world(&[WorldEvent { grid: 7, kind: WorldEvent::VOXELS.into(), chunk: [1, 0, 1] }]).unwrap();
+        assert_eq!((m.hub().voxels, m.persist_asked()), (1, 1));
+        m.restart().unwrap();
+        assert_eq!(m.hub().last_chunk, Some([1, 0, 1]));
+    }
+
     #[test]
     fn world_events_are_counted_by_kind() {
         let mut m = GridMod { grid: 7, ..GridMod::default() };

package/starters/matchmaker/Cargo.toml

@@ -9,5 +9,5 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-ckx-sdk = "0.8.0"
+ckx-sdk = "0.9.0"
 serde = { version = "1", features = ["derive"] }

package/starters/npc-mobs/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-ckx-sdk = "0.8.0"
+ckx-sdk = "0.9.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

package/starters/session/Cargo.toml

@@ -9,5 +9,5 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-ckx-sdk = "0.8.0"
+ckx-sdk = "0.9.0"
 serde = { version = "1", features = ["derive"] }

package/starters/world-tick/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-ckx-sdk = "0.8.0"
+ckx-sdk = "0.9.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

package/templates/hub/src/lib.rs

@@ -39,35 +39,32 @@ ckx_sdk::export_hub!(Counter);
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use ckx_sdk::testing::TestHub;
 
-    fn ctx() -> Ctx {
-        Ctx { app: 1, instance: 1, epoch: 1, version: 1, kind: Kind::Hub, node_type: "counter".into(), key: "main".into() }
-    }
+    use super::*;
 
     #[test]
     fn players_add_and_anyone_reads() {
-        let ctx = ctx();
-        let mut hub = Counter::spawn(&ctx, &[]).unwrap();
-        let five = encode(&5i64).unwrap();
-        hub.handle(&ctx, Call { caller: Caller::Player(7), method: "add", payload: &five }).unwrap();
-        let total: i64 = decode(&hub.handle(&ctx, Call { caller: Caller::Instance(2), method: "get", payload: &[] }).unwrap()).unwrap();
+        let mut hub = TestHub::<Counter>::spawn("counter", "main").unwrap();
+        let total: i64 = hub.call_typed(Caller::Player(7), "add", &5i64).unwrap();
         assert_eq!(total, 5);
+        let read: i64 = hub.call_typed(Caller::Instance(2), "get", &()).unwrap();
+        assert_eq!(read, 5);
     }
 
     #[test]
     fn only_players_add() {
-        let ctx = ctx();
-        let mut hub = Counter::spawn(&ctx, &[]).unwrap();
-        let one = encode(&1i64).unwrap();
-        assert!(hub.handle(&ctx, Call { caller: Caller::Instance(2), method: "add", payload: &one }).is_err());
+        let mut hub = TestHub::<Counter>::spawn("counter", "main").unwrap();
+        let refused = hub.call_typed::<_, i64>(Caller::Instance(2), "add", &1i64).unwrap_err();
+        assert_eq!(refused.status, Status::AppError);
+        assert_eq!(hub.hub().total, 0);
     }
 
     #[test]
-    fn the_snapshot_restores_the_total() {
-        let ctx = ctx();
-        let mut hub = Counter { total: 42 };
-        let snapshot = hub.persist(&ctx).unwrap();
-        assert_eq!(Counter::load(&ctx, &snapshot, 1).unwrap().total, 42);
+    fn the_total_survives_a_restart() {
+        let mut hub = TestHub::<Counter>::spawn("counter", "main").unwrap();
+        hub.call_typed::<_, i64>(Caller::Player(7), "add", &42i64).unwrap();
+        hub.restart().unwrap();
+        assert_eq!(hub.hub().total, 42);
     }
 }

package/templates/spoke/src/lib.rs

@@ -34,6 +34,8 @@ ckx_sdk::export_spoke!(Combat);
 
 #[cfg(test)]
 mod tests {
+    use ckx_sdk::testing::TestSpoke;
+
     use super::*;
 
     #[test]
@@ -44,10 +46,8 @@ mod tests {
 
     #[test]
     fn the_endpoint_answers_in_messagepack() {
-        let ctx = Ctx { app: 1, instance: 1, epoch: 1, version: 1, kind: Kind::Spoke, node_type: "combat".into(), key: String::new() };
-        let mut spoke = Combat::start(&ctx).unwrap();
-        let hit = encode(&Hit { attack: 10, defense: 4 }).unwrap();
-        let reply = spoke.handle(&ctx, Call { caller: Caller::Instance(3), method: "damage", payload: &hit }).unwrap();
-        assert_eq!(decode::<u32>(&reply).unwrap(), 8);
+        let mut spoke = TestSpoke::<Combat>::start("combat").unwrap();
+        let hurt: u32 = spoke.call_typed(Caller::Instance(3), "damage", &Hit { attack: 10, defense: 4 }).unwrap();
+        assert_eq!(hurt, 8);
     }
 }

package/vendor.lock

@@ -16,7 +16,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "ckx-sdk"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "base64",
  "rmp-serde",