WIP - Removing legacy remote-settings client

components/nimbus/android/src/test/java/org/mozilla/experiments/nimbus/NimbusBuilderTest.kt

@@ -7,7 +7,7 @@ package org.mozilla.experiments.nimbus
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import kotlinx.coroutines.Job
-import mozilla.appservices.remotesettings.RemoteSettingsConfig2
+import mozilla.appservices.remotesettings.RemoteSettingsConfig
 import mozilla.appservices.remotesettings.RemoteSettingsService
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -35,7 +35,7 @@ class NimbusBuilderTest {
         }.build(
             appInfo,
             NimbusServerSettings(
-                rsService = RemoteSettingsService(storageDir = "dummy", config = RemoteSettingsConfig2()),
+                rsService = RemoteSettingsService(storageDir = "dummy", config = RemoteSettingsConfig()),
                 collectionName = "nimbus-preview",
             ),
         ) as DummyNimbus

components/nimbus/tests/common.rs

@@ -13,7 +13,7 @@ use nimbus::metrics::{
 use nimbus::stateful::client::NimbusServerSettings;
 use nimbus::stateful::persistence::{Database, SingleStore};
 use nimbus::{AppContext, NimbusClient, RemoteSettingsServer};
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
 use rkv::StoreOptions;
 use std::{path::Path, sync::Arc};
 
@@ -93,7 +93,7 @@ fn new_test_client_internal(
         ..Default::default()
     };
 
-    let config = RemoteSettingsConfig2 {
+    let config = RemoteSettingsConfig {
         server: Some(RemoteSettingsServer::Custom {
             url: url.as_str().to_string(),
         }),

components/nimbus/tests/test_fs_client.rs

@@ -15,7 +15,7 @@ use url::Url;
 use nimbus::error::Result;
 use nimbus::stateful::client::NimbusServerSettings;
 use nimbus::{NimbusClient, RemoteSettingsServer};
-use remote_settings::{RemoteSettingsConfig2, RemoteSettingsContext, RemoteSettingsService};
+use remote_settings::{RemoteSettingsConfig, RemoteSettingsContext, RemoteSettingsService};
 
 use crate::common::NoopMetricsHandler;
 
@@ -30,7 +30,7 @@ fn test_simple() -> Result<()> {
 
     let url = Url::from_file_path(dir).expect("experiments dir should exist");
 
-    let config = RemoteSettingsConfig2 {
+    let config = RemoteSettingsConfig {
         server: Some(RemoteSettingsServer::Custom {
             url: url.as_str().to_string(),
         }),

components/relay/src/rs.rs

@@ -298,11 +298,11 @@ impl RelayRemoteSettingsClient {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use remote_settings::{RemoteSettingsConfig2, RemoteSettingsServer};
+    use remote_settings::{RemoteSettingsConfig, RemoteSettingsServer};
 
     // Helper to create a RemoteSettingsService for testing
     fn create_test_remote_settings_service() -> Arc<RemoteSettingsService> {
-        let config = RemoteSettingsConfig2 {
+        let config = RemoteSettingsConfig {
             server: Some(RemoteSettingsServer::Custom {
                 url: "http://localhost".to_string(),
             }),