Removed old config struct, renamed new config struct

Author: alexcottner

components/remote_settings/src/config.rs

@@ -14,12 +14,8 @@ use crate::error::warn;
 use crate::{ApiResult, Error, RemoteSettingsContext, Result};
 
 /// Remote settings configuration
-///
-/// This is the version used in the new API, hence the `2` at the end.  The plan is to move
-/// consumers to the new API, remove the RemoteSettingsConfig struct, then remove the `2` from this
-/// name.
 #[derive(Debug, Default, Clone, uniffi::Record)]
-pub struct RemoteSettingsConfig2 {
+pub struct RemoteSettingsConfig {
     /// The Remote Settings server to use. Defaults to [RemoteSettingsServer::Prod],
     #[uniffi(default = None)]
     pub server: Option<RemoteSettingsServer>,
@@ -31,23 +27,6 @@ pub struct RemoteSettingsConfig2 {
     pub app_context: Option<RemoteSettingsContext>,
 }
 
-/// Custom configuration for the client.
-/// Currently includes the following:
-/// - `server`: The Remote Settings server to use. If not specified, defaults to the production server (`RemoteSettingsServer::Prod`).
-/// - `server_url`: An optional custom Remote Settings server URL. Deprecated; please use `server` instead.
-/// - `bucket_name`: The optional name of the bucket containing the collection on the server. If not specified, the standard bucket will be used.
-/// - `collection_name`: The name of the collection for the settings server.
-#[derive(Debug, Clone, uniffi::Record)]
-pub struct RemoteSettingsConfig {
-    pub collection_name: String,
-    #[uniffi(default = None)]
-    pub bucket_name: Option<String>,
-    #[uniffi(default = None)]
-    pub server_url: Option<String>,
-    #[uniffi(default = None)]
-    pub server: Option<RemoteSettingsServer>,
-}
-
 /// The Remote Settings server that the client should use.
 #[derive(Debug, Clone, uniffi::Enum)]
 pub enum RemoteSettingsServer {

components/remote_settings/src/lib.rs

@@ -20,7 +20,7 @@ pub(crate) mod jexl_filter;
 mod macros;
 
 pub use client::{Attachment, RemoteSettingsRecord, RsJsonObject};
-pub use config::{BaseUrl, RemoteSettingsConfig2, RemoteSettingsServer};
+pub use config::{BaseUrl, RemoteSettingsConfig, RemoteSettingsServer};
 pub use context::RemoteSettingsContext;
 pub use error::{trace, ApiResult, RemoteSettingsError, Result};
 
@@ -52,7 +52,7 @@ impl RemoteSettingsService {
     /// directory does not exist, it will be created when the storage is first used. Only the
     /// directory and the SQLite files will be created, any parent directories must already exist.
     #[uniffi::constructor]
-    pub fn new(storage_dir: String, config: RemoteSettingsConfig2) -> Self {
+    pub fn new(storage_dir: String, config: RemoteSettingsConfig) -> Self {
         Self {
             internal: service::RemoteSettingsService::new(storage_dir, config),
         }
@@ -79,7 +79,7 @@ impl RemoteSettingsService {
     /// Only intended for QA/debugging.  Swapping the remote settings server in the middle of
     /// execution can cause weird effects.
     #[handle_error(Error)]
-    pub fn update_config(&self, config: RemoteSettingsConfig2) -> ApiResult<()> {
+    pub fn update_config(&self, config: RemoteSettingsConfig) -> ApiResult<()> {
         self.internal.update_config(config)
     }
 

components/remote_settings/src/service.rs

@@ -16,7 +16,7 @@ use viaduct::Request;
 
 use crate::{
     client::RemoteState, config::BaseUrl, error::Error, storage::Storage, RemoteSettingsClient,
-    RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsServer, Result,
+    RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsServer, Result,
 };
 
 /// Internal Remote settings service API
@@ -42,7 +42,7 @@ impl RemoteSettingsService {
     /// Construct a [RemoteSettingsService]
     ///
     /// This is typically done early in the application-startup process
-    pub fn new(storage_dir: String, config: RemoteSettingsConfig2) -> Self {
+    pub fn new(storage_dir: String, config: RemoteSettingsConfig) -> Self {
         let storage_dir = storage_dir.into();
         let base_url = config
             .server
@@ -120,7 +120,7 @@ impl RemoteSettingsService {
     ///
     /// This will cause all current and future clients to use new config and will delete any stored
     /// records causing the clients to return new results from the new config.
-    pub fn update_config(&self, config: RemoteSettingsConfig2) -> Result<()> {
+    pub fn update_config(&self, config: RemoteSettingsConfig) -> Result<()> {
         let base_url = config
             .server
             .unwrap_or(RemoteSettingsServer::Prod)