Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion engine/sdks/rust/data/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ edition.workspace = true
anyhow.workspace = true
gas.workspace = true
rivet-runner-protocol.workspace = true
rivet-util.workspace = true
serde_bare.workspace = true
serde.workspace = true
vbare.workspace = true
Expand Down
24 changes: 12 additions & 12 deletions engine/sdks/rust/data/src/versioned/namespace_runner_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,50 @@
bail!("version not latest");
}
}

Check warning on line 30 in engine/sdks/rust/data/src/versioned/namespace_runner_config.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/actors/actors/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs
fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(NamespaceRunnerConfig::V1(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
2 => Ok(NamespaceRunnerConfig::V2(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
3 => Ok(NamespaceRunnerConfig::V3(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
4 => Ok(NamespaceRunnerConfig::V4(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
5 => Ok(NamespaceRunnerConfig::V5(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
6 => Ok(NamespaceRunnerConfig::V6(
rivet_util::serde::bare_from_slice!(payload)?,
serde_bare::from_slice(payload)?,
)),
_ => bail!("invalid version: {version}"),
}
}

Check warning on line 54 in engine/sdks/rust/data/src/versioned/namespace_runner_config.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/actors/actors/engine/sdks/rust/data/src/versioned/namespace_runner_config.rs
fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
NamespaceRunnerConfig::V1(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
NamespaceRunnerConfig::V2(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
NamespaceRunnerConfig::V3(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
NamespaceRunnerConfig::V4(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
NamespaceRunnerConfig::V5(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
NamespaceRunnerConfig::V6(data) => {
rivet_util::serde::bare_to_vec!(&data).map_err(Into::into)
serde_bare::to_vec(&data).map_err(Into::into)
}
}
}
Expand Down
1 change: 0 additions & 1 deletion engine/sdks/rust/depot-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ edition.workspace = true

[dependencies]
anyhow.workspace = true
rivet-util.workspace = true
serde_bare.workspace = true
serde.workspace = true
vbare.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions engine/sdks/rust/depot-protocol/src/versioned.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ impl OwnedVersionedData for DBHead {

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
_ => bail!("invalid depot db head version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(data) => rivet_util::serde::bare_to_vec!(&data).map_err(Into::into),
Self::V1(data) => serde_bare::to_vec(&data).map_err(Into::into),
}
}
}
Expand Down
1 change: 0 additions & 1 deletion engine/sdks/rust/envoy-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ description = "Versioned Envoy protocol types for Rivet actor hosts"
anyhow.workspace = true
hex.workspace = true
rand.workspace = true
rivet-util.workspace = true
serde_bare.workspace = true
serde.workspace = true
utoipa.workspace = true
Expand Down
148 changes: 74 additions & 74 deletions engine/sdks/rust/envoy-protocol/src/versioned/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -261,24 +261,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -393,24 +393,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -525,24 +525,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -657,24 +657,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -789,24 +789,24 @@

fn deserialize_version(payload: &[u8], version: u16) -> Result<Self> {
match version {
1 => Ok(Self::V1(rivet_util::serde::bare_from_slice!(payload)?)),
2 => Ok(Self::V2(rivet_util::serde::bare_from_slice!(payload)?)),
3 => Ok(Self::V3(rivet_util::serde::bare_from_slice!(payload)?)),
4 => Ok(Self::V4(rivet_util::serde::bare_from_slice!(payload)?)),
5 => Ok(Self::V5(rivet_util::serde::bare_from_slice!(payload)?)),
6 => Ok(Self::V6(rivet_util::serde::bare_from_slice!(payload)?)),
1 => Ok(Self::V1(serde_bare::from_slice(payload)?)),
2 => Ok(Self::V2(serde_bare::from_slice(payload)?)),
3 => Ok(Self::V3(serde_bare::from_slice(payload)?)),
4 => Ok(Self::V4(serde_bare::from_slice(payload)?)),
5 => Ok(Self::V5(serde_bare::from_slice(payload)?)),
6 => Ok(Self::V6(serde_bare::from_slice(payload)?)),
_ => bail!("invalid version: {version}"),
}
}

fn serialize_version(self, _version: u16) -> Result<Vec<u8>> {
match self {
Self::V1(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V2(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V3(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V4(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V5(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V6(x) => rivet_util::serde::bare_to_vec!(&x).map_err(Into::into),
Self::V1(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V2(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V3(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V4(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V5(x) => serde_bare::to_vec(&x).map_err(Into::into),
Self::V6(x) => serde_bare::to_vec(&x).map_err(Into::into),
}
}

Expand Down Expand Up @@ -931,10 +931,10 @@
fn protocol_version_constant_matches_schema_version() {
assert_eq!(PROTOCOL_VERSION, 6);
}

Check warning on line 934 in engine/sdks/rust/envoy-protocol/src/versioned/mod.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/actors/actors/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs
#[test]
fn v1_start_command_deserializes_into_latest_without_sqlite_startup_data() -> Result<()> {
let payload = rivet_util::serde::bare_to_vec!(&v1::ToEnvoy::ToEnvoyCommands(vec![
let payload = serde_bare::to_vec(&v1::ToEnvoy::ToEnvoyCommands(vec![
v1::CommandWrapper {
checkpoint: v1::ActorCheckpoint {
actor_id: "actor".into(),
Expand All @@ -948,7 +948,7 @@
create_ts: 42,
input: None,
},
hibernating_requests: Vec::new(),

Check warning on line 951 in engine/sdks/rust/envoy-protocol/src/versioned/mod.rs

View workflow job for this annotation

GitHub Actions / Rustfmt

Diff in /home/runner/work/actors/actors/engine/sdks/rust/envoy-protocol/src/versioned/mod.rs
preloaded_kv: None,
}),
}
Expand All @@ -970,7 +970,7 @@

#[test]
fn v2_sqlite_response_does_not_deserialize_to_stateless_protocol() -> Result<()> {
let payload = rivet_util::serde::bare_to_vec!(&v2::ToEnvoy::ToEnvoySqliteCommitResponse(
let payload = serde_bare::to_vec(&v2::ToEnvoy::ToEnvoySqliteCommitResponse(
v2::ToEnvoySqliteCommitResponse {
request_id: 1,
data: v2::SqliteCommitResponse::SqliteErrorResponse(v2::SqliteErrorResponse {
Expand Down
1 change: 0 additions & 1 deletion engine/sdks/rust/epoxy-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ edition.workspace = true

[dependencies]
anyhow.workspace = true
rivet-util.workspace = true
serde_bare.workspace = true
serde.workspace = true
vbare.workspace = true
Expand Down
Loading
Loading