Skip to content

Commit

Permalink
chore: wasm/warg namespace cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
zeeshanlakhani committed Mar 27, 2024
1 parent 096b78a commit ddd7483
Show file tree
Hide file tree
Showing 32 changed files with 74 additions and 60 deletions.
Binary file modified examples/websocket-relay/example_test.wasm
Binary file not shown.
12 changes: 6 additions & 6 deletions examples/websocket-relay/relay-app/src/lib/workflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ export const workflowOnePromised = WorkflowBuilder.workflow({
WorkflowBuilder.crop({
name: "crop",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{ cid:bafybeiejevluvtoevgk66plh5t6xiy3ikyuuxg3vgofuvpeckb6eadresm }}",
x: 150,
Expand All @@ -268,15 +268,15 @@ export const workflowOnePromised = WorkflowBuilder.workflow({
WorkflowBuilder.rotate90({
name: "rotate90",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{needs.crop.output}}",
},
}),
WorkflowBuilder.blur({
name: "blur",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{needs.rotate90.output}}",
sigma: 20.2,
Expand All @@ -293,7 +293,7 @@ export const workflowTwoPromised = WorkflowBuilder.workflow({
WorkflowBuilder.crop({
name: "crop",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{ cid:bafybeiejevluvtoevgk66plh5t6xiy3ikyuuxg3vgofuvpeckb6eadresm }}",
x: 150,
Expand All @@ -305,15 +305,15 @@ export const workflowTwoPromised = WorkflowBuilder.workflow({
WorkflowBuilder.rotate90({
name: "rotate90",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{needs.crop.output}}",
},
}),
WorkflowBuilder.grayscale({
name: "grayscale",
resource:
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
args: {
data: "{{needs.rotate90.output}}",
},
Expand Down
3 changes: 3 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
twiggy
unstable.cargo-component
unstable.wasm-tools
# TODO: Return to this
#unstable.wit
];

ci = pkgs.writeScriptBin "ci" ''
Expand Down Expand Up @@ -237,6 +239,7 @@
cp target/wasm32-wasi/release-wasm-fn/homestar_functions_test.wasm homestar-wasm/fixtures/example_test_wasi.wasm
wasm-tools component new homestar-wasm/fixtures/example_test_wasi.wasm -o homestar-wasm/fixtures/example_test_wasi_component.wasm --adapt homestar-functions/wasi_snapshot_preview1.wasm
cp homestar-wasm/fixtures/example_test.wasm examples/websocket-relay/example_test.wasm
wasm-tools component wit homestar-wasm/wit -o homestar-wasm/fixtures/host.wasm --wasm
'';

wasmAdd = pkgs.writeScriptBin "wasm-ex-add" ''
Expand Down
10 changes: 5 additions & 5 deletions homestar-functions/add/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ pub(crate) use __export_add_impl as export;
#[cfg(target_arch = "wasm32")]
#[link_section = "component-type:wit-bindgen:0.20.0:add:encoded world"]
#[doc(hidden)]
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 194] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07I\x01A\x02\x01A\x03\x01\
@\x01\x05inputz\0z\x04\0\x07add-one\x01\0\x04\0\x07add-two\x01\0\x04\x01\x1ahome\
star-functions:add/add\x04\0\x0b\x09\x01\0\x03add\x03\0\0\0G\x09producers\x01\x0c\
processed-by\x02\x0dwit-component\x070.201.0\x10wit-bindgen-rust\x060.20.0";
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 184] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07?\x01A\x02\x01A\x03\x01\
@\x01\x05inputz\0z\x04\0\x07add-one\x01\0\x04\0\x07add-two\x01\0\x04\x01\x10home\
star:add/add\x04\0\x0b\x09\x01\0\x03add\x03\0\0\0G\x09producers\x01\x0cprocessed\
-by\x02\x0dwit-component\x070.201.0\x10wit-bindgen-rust\x060.20.0";

#[inline(never)]
#[doc(hidden)]
Expand Down
2 changes: 1 addition & 1 deletion homestar-functions/add/wit/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package homestar-functions:add;
package homestar:add@0.1.0;

world add {
export add-one: func(input: s32) -> s32;
Expand Down
10 changes: 5 additions & 5 deletions homestar-functions/subtract/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ pub(crate) use __export_subtract_impl as export;
#[cfg(target_arch = "wasm32")]
#[link_section = "component-type:wit-bindgen:0.20.0:subtract:encoded world"]
#[doc(hidden)]
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 225] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07c\x01A\x02\x01A\x04\x01\
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 215] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07Y\x01A\x02\x01A\x04\x01\
@\x02\x01au\x01bu\0u\x04\0\x08subtract\x01\0\x01@\x02\x01a~\x01b~\0~\x04\0\x0csu\
btract-int\x01\x01\x04\x01$homestar-functions:subtract/subtract\x04\0\x0b\x0e\x01\
\0\x08subtract\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x07\
0.201.0\x10wit-bindgen-rust\x060.20.0";
btract-int\x01\x01\x04\x01\x1ahomestar:subtract/subtract\x04\0\x0b\x0e\x01\0\x08\
subtract\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x070.2\
01.0\x10wit-bindgen-rust\x060.20.0";

#[inline(never)]
#[doc(hidden)]
Expand Down
2 changes: 1 addition & 1 deletion homestar-functions/subtract/wit/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package homestar-functions:subtract;
package homestar:subtract@0.1.0;

world subtract {
export subtract: func(a: float64, b: float64) -> float64;
Expand Down
10 changes: 5 additions & 5 deletions homestar-functions/test/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1023,8 +1023,8 @@ pub(crate) use __export_test_impl as export;
#[cfg(target_arch = "wasm32")]
#[link_section = "component-type:wit-bindgen:0.20.0:test:encoded world"]
#[doc(hidden)]
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 948] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb9\x06\x01A\x02\x01\
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 944] = *b"\
\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07\xb5\x06\x01A\x02\x01\
A-\x01B\x04\x01m\x06\x05trace\x05debug\x04info\x04warn\x05error\x08critical\x04\0\
\x05level\x03\0\0\x01@\x03\x05level\x01\x07contexts\x07messages\x01\0\x04\0\x03l\
og\x01\x02\x03\x01\x14wasi:logging/logging\x05\0\x01B\x06\x01r\x03\x07secondsw\x0c\
Expand All @@ -1043,9 +1043,9 @@ le\x01\x11\x01@\x01\x04datas\0\x0c\x04\0\x10grayscale-base64\x01\x12\x04\0\x08ro
tate90\x01\x11\x04\0\x0frotate90-base64\x01\x12\x04\0\x04hash\x01\x12\x01pz\x01k\
z\x01@\x01\x01a\x13\0\x14\x04\0\x03pop\x01\x15\x01j\x01z\0\x01@\x02\x05slice\x13\
\x01xz\0\x16\x04\0\x0dbinary-search\x01\x17\x01j\x01y\x01s\x01@\x01\x03num\x18\0\
\x04\x04\0\x09num-to-kv\x01\x19\x04\x01\x1chomestar-functions:test/test\x04\0\x0b\
\x0a\x01\0\x04test\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-compon\
ent\x070.201.0\x10wit-bindgen-rust\x060.20.0";
\x04\x04\0\x09num-to-kv\x01\x19\x04\x01\x18homestar:test/test@0.1.0\x04\0\x0b\x0a\
\x01\0\x04test\x03\0\0\0G\x09producers\x01\x0cprocessed-by\x02\x0dwit-component\x07\
0.201.0\x10wit-bindgen-rust\x060.20.0";

#[inline(never)]
#[doc(hidden)]
Expand Down
2 changes: 1 addition & 1 deletion homestar-functions/test/wit/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package homestar-functions:test;
package homestar:test@0.1.0;

world test {
import wasi:logging/logging;
Expand Down
2 changes: 1 addition & 1 deletion homestar-invocation/src/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ mod test {
(
"rsc".into(),
Ipld::String(
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q".into(),
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu".into(),
),
),
("op".into(), Ipld::String("ipld/fun".to_string())),
Expand Down
8 changes: 4 additions & 4 deletions homestar-invocation/src/task/instruction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ where
/// use libipld::Ipld;
/// use url::Url;
///
/// let wasm = "bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q".to_string();
/// let wasm = "bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu".to_string();
/// let resource = Url::parse(format!("ipfs://{wasm}").as_str()).unwrap();
///
/// let instr = Instruction::unique(
Expand All @@ -179,7 +179,7 @@ where
/// use libipld::{cid::{multihash::{Code, MultihashDigest}, Cid}, Ipld, Link};
/// use url::Url;

/// let wasm = "bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q".to_string();
/// let wasm = "bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu".to_string();
/// let resource = Url::parse(format!("ipfs://{wasm}").as_str()).expect("IPFS URL");
/// let h = Code::Blake3_256.digest(b"beep boop");
/// let cid = Cid::new_v1(0x55, h);
Expand Down Expand Up @@ -490,7 +490,7 @@ mod test {
(
RESOURCE_KEY.into(),
Ipld::String(
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q".into()
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu".into()
)
),
(OP_KEY.into(), Ipld::String("ipld/fun".to_string())),
Expand All @@ -511,7 +511,7 @@ mod test {
"func": "join-strings"
},
"nnc": "", "op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"});
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"});

let instruction = Instruction::<Unit>::try_from(ipld.clone()).unwrap();
let instr_cid = instruction.to_cid().unwrap();
Expand Down
2 changes: 1 addition & 1 deletion homestar-invocation/src/test_utils/invocation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use std::collections::BTreeMap;
use url::Url;

const RAW: u64 = 0x55;
const WASM_CID: &str = "bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q";
const WASM_CID: &str = "bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu";

type NonceBytes = Vec<u8>;

Expand Down
2 changes: 1 addition & 1 deletion homestar-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub(crate) mod metrics;
pub use event_handler::notification::{network::NetworkNotification, receipt::ReceiptNotification};
#[allow(unused_imports)]
pub(crate) use event_handler::EventHandler;
pub use network::webserver::PrometheusData;
pub use network::webserver::{listener, PrometheusData};
pub use receipt::{Receipt, RECEIPT_TAG, VERSION_KEY};
pub use runner::{NodeInfo, Runner};
pub(crate) use scheduler::TaskScheduler;
Expand Down
2 changes: 1 addition & 1 deletion homestar-runtime/src/network/webserver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use tower_http::{
};
use tracing::{debug, error, info};

pub(crate) mod listener;
pub mod listener;
#[cfg(feature = "websocket-notify")]
pub(crate) mod notifier;
mod prom;
Expand Down
7 changes: 4 additions & 3 deletions homestar-runtime/src/network/webserver/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ use std::collections::BTreeMap;
const NAME_KEY: &str = "name";
const WORKFLOW_KEY: &str = "workflow";

/// A [Workflow] run command via a WebSocket channel.
/// A [Workflow] run command via a WebSocket channel for JSON inputs.
///
/// Note: We leverage the [RawValue] type in order to use our DagJson
/// implementation, which is not a direct [Deserialize] implementation.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub(crate) struct JsonRun<'a> {
pub struct JsonRun<'a> {
#[serde(default = "default_name")]
pub(crate) name: FastStr,
#[serde(deserialize_with = "from_raw_value")]
Expand All @@ -42,8 +42,9 @@ where
Workflow::from_json(raw_value.get().as_bytes()).map_err(de::Error::custom)
}

/// A [Workflow] run command via a WebSocket channel for CBOR inputs.
#[derive(Debug, Clone, PartialEq, Serialize)]
pub(crate) struct CborRun<'a> {
pub struct CborRun<'a> {
pub(crate) name: FastStr,
pub(crate) workflow: Workflow<'a, Arg>,
}
Expand Down
2 changes: 1 addition & 1 deletion homestar-runtime/src/tasks/fetch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub(crate) struct Fetch;

#[cfg(any(test, feature = "test-utils"))]
#[doc(hidden)]
const WASM_CID: &str = "bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q";
const WASM_CID: &str = "bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu";
#[cfg(any(test, feature = "test-utils"))]
#[doc(hidden)]
const CAT_CID: &str = "bafybeiejevluvtoevgk66plh5t6xiy3ikyuuxg3vgofuvpeckb6eadresm";
Expand Down
6 changes: 3 additions & 3 deletions homestar-runtime/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ fn test_workflow_run_integration() -> Result<()> {
.assert()
.success()
.stdout(predicate::str::contains(
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
))
.stdout(predicate::str::contains("num_tasks"))
.stdout(predicate::str::contains("progress_count"));
Expand All @@ -257,7 +257,7 @@ fn test_workflow_run_integration() -> Result<()> {
.assert()
.success()
.stdout(predicate::str::contains(
"ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
"ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu",
))
.stdout(predicate::str::contains("num_tasks"))
.stdout(predicate::str::contains("progress_count"));
Expand All @@ -273,7 +273,7 @@ fn test_workflow_run_integration_nonced() -> Result<()> {
let rpc_port = proc_info.rpc_port;
let metrics_port = proc_info.metrics_port;
let ws_port = proc_info.ws_port;
let workflow_cid = "bafyrmid4ev2l44lgbazmgg36rui3eirzp5tg5ebnaexyogdnzv4hmvvtay";
let workflow_cid = "bafyrmiemplwg3twkbc5wu7nl5bxups5u673zepj4jcxsgfci4w5yudhv4u";
let toml = format!(
r#"
[node]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"nnc": "1sod60ml6g26mfhsrsa0",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
},
{
Expand All @@ -31,7 +31,7 @@
"args": [
{
"await/ok": {
"/": "bafyrmig5x46c6nzk74adlo6ffwo4bi7fr42jkv54zqa5kzazfirb47ninm"
"/": "bafyrmic5dphdlhwfn4cmmurtmyilpjm6hvc5g4nscfwjrjtewv2vgr4ydq"
}
}
],
Expand All @@ -41,7 +41,7 @@
"/": { "bytes": "oVI8XiFiec+c2XHS" }
},
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
},
{
Expand All @@ -57,15 +57,15 @@
"args": [
{
"await/ok": {
"/": "bafyrmiaa2pbgwydezutitiqq6j6qd73o3gqpeycp4g6dxnx466xdxjfnvq"
"/": "bafyrmic5agpdrqid54ajsk37enjpuvisgftugvk3n7okkrax54pilj46vm"
}
}
],
"func": "add_one"
},
"nnc": "",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"nnc": "",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"nnc": "",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions homestar-runtime/tests/fixtures/test-workflow-add-one.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"nnc": "",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
},
{
Expand All @@ -31,15 +31,15 @@
"args": [
{
"await/ok": {
"/": "bafyrmigpfy6vvnfmv2wpsnpjmrn6iurejcjhz2doqdl6cfext27etqvi54"
"/": "bafyrmigav2akzikvl53tcqc7hfgvk4mntjxmiplzxi32ma7zqrlysjoqty"
}
}
],
"func": "add_one"
},
"nnc": "",
"op": "wasm/run",
"rsc": "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q"
"rsc": "ipfs://bafybeiabee2ngqpdo7nant5wtj7hejzr7bse2kb54u4zg4gktjvih5uyfu"
}
}
]
Expand Down
Binary file not shown.
Loading

0 comments on commit ddd7483

Please sign in to comment.