feat!: update marine-rs-sdk to 0.12.0 and marine, support worker_id in CallParameters (#113)

update marine-rs-sdk and marine
This commit is contained in:
Valery Antopol 2024-02-13 18:24:30 +04:00 committed by GitHub
parent f5ed6bfd52
commit 3d0b62bc93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 80 additions and 115 deletions

183
Cargo.lock generated
View File

@ -149,7 +149,7 @@ dependencies = [
name = "build-rs-example" name = "build-rs-example"
version = "0.12.1" version = "0.12.1"
dependencies = [ dependencies = [
"marine-rs-sdk 0.8.1", "marine-rs-sdk",
"marine-rs-sdk-test", "marine-rs-sdk-test",
] ]
@ -290,7 +290,7 @@ dependencies = [
name = "consumer" name = "consumer"
version = "0.12.1" version = "0.12.1"
dependencies = [ dependencies = [
"marine-rs-sdk 0.8.1", "marine-rs-sdk",
] ]
[[package]] [[package]]
@ -670,9 +670,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-app-service" name = "fluence-app-service"
version = "0.31.0" version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5be1794d6900d3b0376a54d8017d656a1d549e4503b7075f977cbc476c9293b3" checksum = "a778e8164aa18de47e53c65f04f56b8dee7d3a7decef0d76313f41d855d990d2"
dependencies = [ dependencies = [
"log", "log",
"maplit", "maplit",
@ -1021,9 +1021,9 @@ dependencies = [
[[package]] [[package]]
name = "it-json-serde" name = "it-json-serde"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bdf951681696f6c957026a6aa576c9a6b1a25e753c1f4d62f75fcf0ff38abe5" checksum = "a74b6ed688d9de56b4e4cb5aca2bd7a883909f1be8d8d6ba40e3a2d25b9feba5"
dependencies = [ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
@ -1178,20 +1178,31 @@ dependencies = [
[[package]] [[package]]
name = "marine-call-parameters" name = "marine-call-parameters"
version = "0.10.1" version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "979e5c52888bae300c937e36240293c20e34bb7b29d058375b15f85e713dd854" checksum = "ef9a7c6ed5fa9052474c1cd76d3b3e67dbc4c455c76263c2c043214e12cce6bd"
dependencies = [ dependencies = [
"marine-macro 0.10.1", "marine-macro 0.10.3",
"marine-rs-sdk-main 0.10.1", "marine-rs-sdk-main 0.10.3",
"serde",
]
[[package]]
name = "marine-call-parameters"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f47b1186bad0b2a5e9218e3f6fbe0612ef6b17c58c58537d77bd08044596ea95"
dependencies = [
"marine-macro 0.12.0",
"marine-rs-sdk-main 0.12.0",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-core" name = "marine-core"
version = "0.26.0" version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb4758abae2100ab5a89e6df2341492ac753a7c9be72076528b5adf94aeaeb8f" checksum = "9ff7a647c1c71708d7888f4ffb345c941707834bbd6d045902f87b9d9cb6221f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytesize", "bytesize",
@ -1218,13 +1229,13 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-generator" name = "marine-it-generator"
version = "0.13.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "416d13df5d4d301fc780ae85368e031c1526dc23c9609ecc8a89c09b246d999c" checksum = "93d2788f00beff11b53596c9bd4b4f0e0e9722e4a3562f87245c0cda9acfb6f2"
dependencies = [ dependencies = [
"it-lilo", "it-lilo",
"marine-it-parser", "marine-it-parser",
"marine-macro-impl 0.7.1", "marine-macro-impl 0.12.0",
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
@ -1235,9 +1246,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-interfaces" name = "marine-it-interfaces"
version = "0.9.0" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "942f05f37d694802550d9dfed55a1d56fe53f15ef3a3219b9345e9a235c042cd" checksum = "1c610d90a031911c17b2babc32c9fad7261bae6ab0bf118051cd665b5d9bcfbe"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl", "wasmer-interface-types-fl",
@ -1245,9 +1256,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-it-parser" name = "marine-it-parser"
version = "0.15.0" version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec9325e7cf7c4e01087be83ae5abb26fe76445b0df517a201fbe6ca298b8661b" checksum = "921afa7f139791b24c4cb91c918d1ef7411ef40c3b801309ec43f6b2c89b107b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools", "itertools",
@ -1264,29 +1275,29 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro" name = "marine-macro"
version = "0.8.1" version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea" checksum = "acdaa50f8239afa104ef8a99d4219288f68169e29c913485bbd094a35fe79113"
dependencies = [ dependencies = [
"marine-macro-impl 0.8.1", "marine-macro-impl 0.10.3",
"marine-rs-sdk-main 0.8.1", "marine-rs-sdk-main 0.10.3",
] ]
[[package]] [[package]]
name = "marine-macro" name = "marine-macro"
version = "0.10.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93835918915610947b5ce96a4b3d89268fde2842a6d18d893c86ffe1b605c16e" checksum = "727b1a5449eb1676837c5fc22a8c31dc9980dcef4de938f26f2eaf7c2c54331b"
dependencies = [ dependencies = [
"marine-macro-impl 0.10.1", "marine-macro-impl 0.12.0",
"marine-rs-sdk-main 0.10.1", "marine-rs-sdk-main 0.12.0",
] ]
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.7.1" version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca474b63cabaf8d7d9b38de87d630023cbc91ddc77e92f9c7bb745462a131b44" checksum = "460ef42c1bf6dbb88976a00514f8e1b97a7ccb60e3e6009cbb563b0d163166c7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1297,22 +1308,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.8.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196" checksum = "57c8cd8a228856db057bd4a32c6e2708848b2b1db7552be0a6063d534cafb4e2"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn 1.0.109",
]
[[package]]
name = "marine-macro-impl"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c794126e4a2f5b78b43bc7c82329dc6ffa0c2511591803f89a6d97c037feb068"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1334,9 +1332,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-min-it-version" name = "marine-min-it-version"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a84be3c30abaa13df50cdaceb6b62ca806ac8a10fd5bacfeb4371ec1bd0f5101" checksum = "147e6e4c9d3dc9afbb06b2e3bc069b63c749733f698d0c364c320a72b133f1d5"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"semver", "semver",
@ -1344,14 +1342,14 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-info-parser" name = "marine-module-info-parser"
version = "0.11.0" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b3c94cb70c951bf8ef26bd921ef9ddc5b61e2a45b7c62683ad98313f21fb8df" checksum = "756f037bef1271185452eb8297435751af31d8c62f7b04841bacf1b24d562c83"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
"derivative", "derivative",
"marine-rs-sdk-main 0.10.1", "marine-rs-sdk-main 0.12.0",
"marine-wasm-backend-traits", "marine-wasm-backend-traits",
"semver", "semver",
"serde", "serde",
@ -1361,9 +1359,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-interface" name = "marine-module-interface"
version = "0.8.0" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ace780e273bfa9c2124e53da578af10059e053ba9c22400e1e86a99c00576c4" checksum = "d92d2243bf0d3aea6401d9e57a1ee17677b624337981322e0153cc2d54744080"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools", "itertools",
@ -1378,35 +1376,22 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk" name = "marine-rs-sdk"
version = "0.8.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11991d31bf4d53651e1c151637f260c759eb9f28ecf8c894eb260b50f46459cc" checksum = "7662e4c6c08f7cd1b63cd6ff8e473e3239a9d3dd10fb46bec357cb8331423268"
dependencies = [ dependencies = [
"marine-macro 0.8.1", "marine-call-parameters 0.12.0",
"marine-rs-sdk-main 0.8.1", "marine-macro 0.12.0",
"marine-timestamp-macro 0.8.1", "marine-rs-sdk-main 0.12.0",
"polyplets", "marine-timestamp-macro",
"serde",
]
[[package]]
name = "marine-rs-sdk"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eeb2e2a1ab3f7a2ba270ff42bc2d4fa0d1a0b0f6bdb377b2db4403030a854a"
dependencies = [
"marine-call-parameters",
"marine-macro 0.10.1",
"marine-rs-sdk-main 0.10.1",
"marine-timestamp-macro 0.10.1",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.8.1" version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd" checksum = "031eeea016dab58c1ccb0c65b798cb5e47d214b05115c8c06198717d18275756"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1414,9 +1399,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.10.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "997cdfb9fdef7066a527e9436938618d0596e00f4cceea1ab3b5bb32d20947f6" checksum = "6cba9000500575b4965ec44e44bbbfd056d121be1195969ce1a5cc146646c37b"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1437,19 +1422,20 @@ dependencies = [
[[package]] [[package]]
name = "marine-runtime" name = "marine-runtime"
version = "0.32.0" version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4254658402bf40cb64c0116f44124de84fee46e7fcd413ae6cc6097cbd6b3bff" checksum = "ee2daa12b5143d9a152d6ae2f6accdc884887a653a2b259af901df86a6f49833"
dependencies = [ dependencies = [
"bytesize", "bytesize",
"it-json-serde", "it-json-serde",
"it-memory-traits", "it-memory-traits",
"itertools", "itertools",
"log", "log",
"marine-call-parameters 0.10.3",
"marine-core", "marine-core",
"marine-module-interface", "marine-module-interface",
"marine-rs-sdk 0.10.1", "marine-rs-sdk",
"marine-rs-sdk-main 0.10.1", "marine-rs-sdk-main 0.12.0",
"marine-utils", "marine-utils",
"marine-wasm-backend-traits", "marine-wasm-backend-traits",
"marine-wasmtime-backend", "marine-wasmtime-backend",
@ -1494,19 +1480,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-timestamp-macro" name = "marine-timestamp-macro"
version = "0.8.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d254ea11e35cdeccc62ffccf78775c066750c9e5bae4934eb0758187442282" checksum = "47ec0d664570661ecba1feba2dda610ab63f23733edf189dcde7b5ed23966144"
dependencies = [
"chrono",
"quote",
]
[[package]]
name = "marine-timestamp-macro"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55ccb7870fd62eb4cc34a86b0ae8bdca680067138c3bb10fca7fb67e03242ca4"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -1514,15 +1490,15 @@ dependencies = [
[[package]] [[package]]
name = "marine-utils" name = "marine-utils"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e86cb57ff0e2fdc8e188a52d388287d38e5cc781eddd09a82d20f8ee1f48b80" checksum = "fce56bfabfd0af5326ff81c32c8d2261aa03b10e00ea6c165de4ebf8a3f998e4"
[[package]] [[package]]
name = "marine-wasm-backend-traits" name = "marine-wasm-backend-traits"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "470aaec9c93cec6a4cfd6ce78e338c92e688da14d3203863c517a96027aec417" checksum = "220bc47cfabb8b4ab97bf2bd7bbab9738857b69beeda0a1ac5776c600b64bb46"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"it-memory-traits", "it-memory-traits",
@ -1535,9 +1511,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-wasmtime-backend" name = "marine-wasmtime-backend"
version = "0.5.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1f9991a1c37b7d414c6865ddb04e93c27b260d8e575cb2b6d994454c69ebf76" checksum = "aaa0dc5a7da0e3334f3ce5b341ba4354341af9a1f9efae24884a1b931efdf23e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"it-memory-traits", "it-memory-traits",
@ -1722,17 +1698,6 @@ version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "polyplets"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b579a79a461ca50abb202eac61c76d8782fdf091a91775c9e181352e7cd30a8b"
dependencies = [
"marine-macro 0.8.1",
"marine-rs-sdk-main 0.8.1",
"serde",
]
[[package]] [[package]]
name = "ppv-lite86" name = "ppv-lite86"
version = "0.2.17" version = "0.2.17"
@ -1775,7 +1740,7 @@ dependencies = [
name = "producer" name = "producer"
version = "0.12.1" version = "0.12.1"
dependencies = [ dependencies = [
"marine-rs-sdk 0.8.1", "marine-rs-sdk",
] ]
[[package]] [[package]]
@ -2049,7 +2014,7 @@ dependencies = [
name = "single-service-example" name = "single-service-example"
version = "0.12.1" version = "0.12.1"
dependencies = [ dependencies = [
"marine-rs-sdk 0.8.1", "marine-rs-sdk",
"marine-rs-sdk-test", "marine-rs-sdk-test",
] ]

View File

@ -23,7 +23,7 @@ trybuild = "1.0"
[dependencies] [dependencies]
marine-test-macro = { path = "crates/marine-test-macro", version = "=0.12.1" } marine-test-macro = { path = "crates/marine-test-macro", version = "=0.12.1" }
marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.12.1" } marine-build-rs-generator = { path = "crates/marine-build-rs-generator", version = "=0.12.1" }
fluence-app-service = { version = "0.31.0", features = ["raw-module-api"] } fluence-app-service = { version = "0.32.0", features = ["raw-module-api"] }
serde = { version = "1.0.162", features = ["derive"] } serde = { version = "1.0.162", features = ["derive"] }
serde_json = "1.0.96" serde_json = "1.0.96"

View File

@ -14,7 +14,7 @@ license = "Apache-2.0"
all-features = true all-features = true
[dependencies] [dependencies]
fluence-app-service = { version = "0.31.0", features = ["raw-module-api"] } fluence-app-service = { version = "0.32.0", features = ["raw-module-api"] }
marine-it-parser = "0.15.0" marine-it-parser = "0.15.0"
itertools = "0.10.5" itertools = "0.10.5"
darling = "0.20.1" darling = "0.20.1"

View File

@ -12,7 +12,7 @@ name = "build_rs_test"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.12.0"
[dev-dependencies] [dev-dependencies]
marine-rs-sdk-test = { path = "../.." } marine-rs-sdk-test = { path = "../.." }

View File

@ -10,4 +10,4 @@ name = "consumer"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.12.0"

View File

@ -10,4 +10,4 @@ name = "producer"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.12.0"

View File

@ -12,7 +12,7 @@ name = "greeting"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.12.0"
[dev-dependencies] [dev-dependencies]
marine-rs-sdk-test = { path = "../.." } marine-rs-sdk-test = { path = "../.." }