Revert "[teams 1/5] Reset database (#3611)"

This reverts commit e0b8e6f.

Author: jdetter

Cargo.lock

@@ -8,8 +8,8 @@ use std::path::PathBuf;
 use std::{env, fs};
 
 use crate::config::Config;
-use crate::util::{add_auth_header_opt, get_auth_header, unauth_error_context, AuthHeader, ResponseExt};
-use crate::util::{decode_identity, y_or_n};
+use crate::util::{add_auth_header_opt, get_auth_header, AuthHeader, ResponseExt};
+use crate::util::{decode_identity, unauth_error_context, y_or_n};
 use crate::{build, common_args};
 
 pub fn cli() -> clap::Command {

crates/cli/src/subcommands/publish.rs

@@ -53,7 +53,6 @@ scopeguard.workspace = true
 serde_with.workspace = true
 async-stream.workspace = true
 humantime.workspace = true
-thiserror.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 jemalloc_pprof.workspace = true

crates/client-api/Cargo.toml

@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use axum::response::ErrorResponse;
-use bytes::Bytes;
 use http::StatusCode;
 
 use spacetimedb::client::ClientActorIndex;
@@ -156,7 +155,7 @@ pub struct DatabaseDef {
     /// The [`Identity`] the database shall have.
     pub database_identity: Identity,
     /// The compiled program of the database module.
-    pub program_bytes: Bytes,
+    pub program_bytes: Vec<u8>,
     /// The desired number of replicas the database shall have.
     ///
     /// If `None`, the edition default is used.
@@ -165,14 +164,6 @@ pub struct DatabaseDef {
     pub host_type: HostType,
 }
 
-/// Parameters for resetting a database via [`ControlStateDelegate::reset_database`].
-pub struct DatabaseResetDef {
-    pub database_identity: Identity,
-    pub program_bytes: Option<Bytes>,
-    pub num_replicas: Option<NonZeroU8>,
-    pub host_type: Option<HostType>,
-}
-
 /// API of the SpacetimeDB control plane.
 ///
 /// The trait is the composition of [`ControlStateReadAccess`] and
@@ -242,10 +233,6 @@ pub trait ControlStateWriteAccess: Send + Sync {
 
     async fn delete_database(&self, caller_identity: &Identity, database_identity: &Identity) -> anyhow::Result<()>;
 
-    /// Remove all data from a database, and reset it according to the
-    /// given [DatabaseResetDef].
-    async fn reset_database(&self, caller_identity: &Identity, spec: DatabaseResetDef) -> anyhow::Result<()>;
-
     // Energy
     async fn add_energy(&self, identity: &Identity, amount: EnergyQuanta) -> anyhow::Result<()>;
     async fn withdraw_energy(&self, identity: &Identity, amount: EnergyQuanta) -> anyhow::Result<()>;
@@ -345,10 +332,6 @@ impl<T: ControlStateWriteAccess + ?Sized> ControlStateWriteAccess for Arc<T> {
         (**self).delete_database(caller_identity, database_identity).await
     }
 
-    async fn reset_database(&self, caller_identity: &Identity, spec: DatabaseResetDef) -> anyhow::Result<()> {
-        (**self).reset_database(caller_identity, spec).await
-    }
-
     async fn add_energy(&self, identity: &Identity, amount: EnergyQuanta) -> anyhow::Result<()> {
         (**self).add_energy(identity, amount).await
     }