From 2768bc3acac0f5af539610fceb6fcda37628ddc7 Mon Sep 17 00:00:00 2001 From: vms Date: Tue, 8 Sep 2020 13:20:42 +0300 Subject: [PATCH] update ipfs-node example --- Cargo.lock | 108 ++++++++++----------- examples/ipfs-node/Config.toml | 6 +- examples/ipfs-node/artifacts/ipfs_rpc_file | 1 - examples/ipfs-node/effector/Cargo.toml | 2 +- examples/ipfs-node/pure/src/main.rs | 2 +- 5 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 examples/ipfs-node/artifacts/ipfs_rpc_file diff --git a/Cargo.lock b/Cargo.lock index 47674a7c..ef9750df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,12 +82,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" @@ -297,12 +291,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" dependencies = [ - "cfg-if", "crossbeam-utils", + "maybe-uninit", ] [[package]] @@ -594,7 +588,7 @@ name = "fce-wit-generator" version = "0.1.2" dependencies = [ "fce-wit-parser", - "fluence-sdk-wit 0.2.2", + "fluence-sdk-wit 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "serde", "serde_json", @@ -636,11 +630,11 @@ dependencies = [ [[package]] name = "fluence" -version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#d0db9a365f68046e3fe8d2ae19badb988c68ea3f" +version = "0.2.2" +source = "git+https://github.com/fluencelabs/rust-sdk#ff447a32586b3f088a57fe51b1e5baf3e17b5c12" dependencies = [ - "fluence-sdk-macro 0.2.0", - "fluence-sdk-main 0.2.0", + "fluence-sdk-macro 0.2.2 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence-sdk-main 0.2.2 (git+https://github.com/fluencelabs/rust-sdk)", ] [[package]] @@ -660,7 +654,7 @@ version = "0.1.1" dependencies = [ "cmd_lib", "fce", - "fluence-sdk-main 0.2.2", + "fluence-sdk-main 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log", "safe-transmute", "serde", @@ -675,10 +669,10 @@ dependencies = [ [[package]] name = "fluence-sdk-macro" -version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#d0db9a365f68046e3fe8d2ae19badb988c68ea3f" +version = "0.2.2" +source = "git+https://github.com/fluencelabs/rust-sdk#ff447a32586b3f088a57fe51b1e5baf3e17b5c12" dependencies = [ - "fluence-sdk-wit 0.2.0", + "fluence-sdk-wit 0.2.2 (git+https://github.com/fluencelabs/rust-sdk)", ] [[package]] @@ -687,15 +681,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21ca1fdcc78a17bc84798cdc2b13c36a07555b1a3dfe9db9a6ec3a3079aaebe6" dependencies = [ - "fluence-sdk-wit 0.2.2", + "fluence-sdk-wit 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fluence-sdk-main" -version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#d0db9a365f68046e3fe8d2ae19badb988c68ea3f" +version = "0.2.2" +source = "git+https://github.com/fluencelabs/rust-sdk#ff447a32586b3f088a57fe51b1e5baf3e17b5c12" dependencies = [ - "fluence-sdk-macro 0.2.0", + "fluence-sdk-macro 0.2.2 (git+https://github.com/fluencelabs/rust-sdk)", "log", "serde", ] @@ -706,15 +700,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26474b00df6b7ec38cfcaf96c8636bca84f3e504c3e192c3341dc2372e23b30e" dependencies = [ - "fluence-sdk-macro 0.2.2", + "fluence-sdk-macro 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log", "serde", ] [[package]] name = "fluence-sdk-wit" -version = "0.2.0" -source = "git+https://github.com/fluencelabs/rust-sdk#d0db9a365f68046e3fe8d2ae19badb988c68ea3f" +version = "0.2.2" +source = "git+https://github.com/fluencelabs/rust-sdk#ff447a32586b3f088a57fe51b1e5baf3e17b5c12" dependencies = [ "proc-macro2", "quote", @@ -882,7 +876,7 @@ checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] @@ -933,12 +927,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "autocfg", -] +checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7" [[package]] name = "heck" @@ -1062,9 +1053,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" +checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" dependencies = [ "autocfg", "hashbrown", @@ -1073,9 +1064,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c68da9c8b1bda33dc6f55b2a9b4f44eca5ba2b2a1a308eab40db9fb7e200cb" +checksum = "fedd49de24d8c263613701406611410687148ae8c37cd6452650b250f753a0dd" dependencies = [ "ctor", "ghost", @@ -1084,9 +1075,9 @@ dependencies = [ [[package]] name = "inventory-impl" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4143007b389ae51577282e3c95cf5a7ae0c9e06cafa927508300ceedcbc0354c" +checksum = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da" dependencies = [ "proc-macro2", "quote", @@ -1302,9 +1293,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" +checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" dependencies = [ "serde", ] @@ -1329,9 +1320,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" +checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" dependencies = [ "cfg-if", "libc", @@ -1554,9 +1545,9 @@ checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29" dependencies = [ "unicode-xid", ] @@ -1688,9 +1679,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_users" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom", "redox_syscall", @@ -1726,11 +1717,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12427a5577082c24419c9c417db35cfeb65962efc7675bb6b0d5f1f9d315bfe6" +checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" dependencies = [ - "base64 0.12.3", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1761,11 +1752,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" dependencies = [ - "base64 0.11.0", + "base64", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -2031,9 +2022,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1" [[package]] name = "syn" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9" +checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350" dependencies = [ "proc-macro2", "quote", @@ -2139,11 +2130,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -2452,6 +2444,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasm-bindgen" version = "0.2.67" diff --git a/examples/ipfs-node/Config.toml b/examples/ipfs-node/Config.toml index cb8b7a5e..a778883c 100644 --- a/examples/ipfs-node/Config.toml +++ b/examples/ipfs-node/Config.toml @@ -1,7 +1,7 @@ -modules_dir = "artifacts/wasm_modules" +modules_dir = "artifacts" [[module]] - name = "ipfs_node.wasm" + name = "ipfs_effector" mem_pages_count = 100 logger_enabled = true @@ -12,6 +12,6 @@ modules_dir = "artifacts/wasm_modules" envs = ["IPFS_ADDR=/dns4/relay02.fluence.dev/tcp/15001", "timeout=1s"] [[module]] - name = "ipfs_pure.wasm" + name = "ipfs_pure" mem_pages_count = 100 logger_enabled = true diff --git a/examples/ipfs-node/artifacts/ipfs_rpc_file b/examples/ipfs-node/artifacts/ipfs_rpc_file deleted file mode 100644 index dbe9dba5..00000000 --- a/examples/ipfs-node/artifacts/ipfs_rpc_file +++ /dev/null @@ -1 +0,0 @@ -Hello, world \ No newline at end of file diff --git a/examples/ipfs-node/effector/Cargo.toml b/examples/ipfs-node/effector/Cargo.toml index c9119230..3b41c132 100644 --- a/examples/ipfs-node/effector/Cargo.toml +++ b/examples/ipfs-node/effector/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Fluence Labs"] edition = "2018" [[bin]] -name = "ipfs_node" +name = "ipfs_effector" path = "src/main.rs" [dependencies] diff --git a/examples/ipfs-node/pure/src/main.rs b/examples/ipfs-node/pure/src/main.rs index 4c3bb1a6..8a22b5c2 100644 --- a/examples/ipfs-node/pure/src/main.rs +++ b/examples/ipfs-node/pure/src/main.rs @@ -54,7 +54,7 @@ pub fn get(hash: String) -> Vec { } #[fce] -#[link(wasm_import_module = "ipfs_node.wasm")] +#[link(wasm_import_module = "ipfs_effector")] extern "C" { /// Put provided file to ipfs, return ipfs hash of the file. #[link_name = "put"]