Skip to content

Commit 00df34a

Browse files
authored
Merge pull request #83 from golemcloud/error-serialization-fix
GOL-184 Tests and fixes for oplog error serialization
2 parents cb6627b + f99677a commit 00df34a

File tree

24 files changed

+1020
-265
lines changed

24 files changed

+1020
-265
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ lazy_static = "1.4.0"
6666
poem = "2.0.0"
6767
poem-openapi = { version = "4.0.0", features = ["swagger-ui", "chrono", "time", "humantime", "uuid", "url", "websocket"] }
6868
prometheus = { version = "0.13.3", features = ["process"] }
69+
proptest = "1.4.0"
6970
prost = "0.12.3"
7071
rustls = { version = "0.22.2" }
7172
serde = { version = "1.0", features = ["derive"] }

golem-service-base/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ tracing = { workspace = true }
2626
url = { workspace = true }
2727

2828
[dev-dependencies]
29-
proptest = "1.4.0"
29+
proptest = { workspace = true }

golem-worker-executor-base/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ console-subscriber = { workspace = true }
8080
ctor = "0.2.6"
8181
fred = { workspace = true, features = ["metrics", "serde-json", "partial-tracing", "mocks"] }
8282
golem-wasm-ast = { workspace = true }
83+
proptest = { workspace = true }
8384
redis = { version = "0.24.0", features = ["default"] }
8485
serde_json = { workspace = true }
8586
tracing-subscriber = { workspace = true }

golem-worker-executor-base/src/durable_host/blobstore/container.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use wasmtime_wasi::preview2::WasiView;
66
use crate::durable_host::blobstore::types::{
77
ContainerEntry, IncomingValueEntry, OutgoingValueEntry, StreamObjectNamesEntry,
88
};
9-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableError};
9+
use crate::durable_host::serialized::SerializableError;
10+
use crate::durable_host::{Durability, DurableWorkerCtx};
1011
use crate::metrics::wasm::record_host_function_call;
1112
use crate::preview2::wasi::blobstore::container::{
1213
Container, ContainerMetadata, Error, Host, HostContainer, HostStreamObjectNames, IncomingValue,

golem-worker-executor-base/src/durable_host/blobstore/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use wasmtime::component::Resource;
77
use wasmtime_wasi::preview2::WasiView;
88

99
use crate::durable_host::blobstore::types::ContainerEntry;
10-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableError};
10+
use crate::durable_host::serialized::SerializableError;
11+
use crate::durable_host::{Durability, DurableWorkerCtx};
1112
use crate::metrics::wasm::record_host_function_call;
1213
use crate::preview2::wasi::blobstore::blobstore::{
1314
Container, ContainerName, Error, Host, ObjectId,

golem-worker-executor-base/src/durable_host/cli/environment.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use async_trait::async_trait;
22

3-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableError};
3+
use crate::durable_host::serialized::SerializableError;
4+
use crate::durable_host::{Durability, DurableWorkerCtx};
45
use crate::metrics::wasm::record_host_function_call;
56
use crate::workerctx::WorkerCtx;
67
use golem_common::model::WrappedFunctionType;

golem-worker-executor-base/src/durable_host/clocks/monotonic_clock.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use async_trait::async_trait;
22
use wasmtime::component::Resource;
33

4-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableError};
4+
use crate::durable_host::serialized::SerializableError;
5+
use crate::durable_host::{Durability, DurableWorkerCtx};
56
use crate::metrics::wasm::record_host_function_call;
67
use crate::workerctx::WorkerCtx;
78
use golem_common::model::WrappedFunctionType;

golem-worker-executor-base/src/durable_host/clocks/wall_clock.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use async_trait::async_trait;
22

3-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableDateTime, SerializableError};
3+
use crate::durable_host::serialized::{SerializableDateTime, SerializableError};
4+
use crate::durable_host::{Durability, DurableWorkerCtx};
45
use crate::metrics::wasm::record_host_function_call;
56
use crate::workerctx::WorkerCtx;
67
use golem_common::model::WrappedFunctionType;

golem-worker-executor-base/src/durable_host/filesystem/preopens.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use anyhow::anyhow;
22
use async_trait::async_trait;
33
use wasmtime::component::Resource;
44

5-
use crate::durable_host::{Durability, DurableWorkerCtx, SerializableError};
5+
use crate::durable_host::serialized::SerializableError;
6+
use crate::durable_host::{Durability, DurableWorkerCtx};
67
use crate::metrics::wasm::record_host_function_call;
78
use crate::workerctx::WorkerCtx;
89
use golem_common::model::WrappedFunctionType;

0 commit comments

Comments
 (0)