worker/Environment: Remove unused uploader field

Author: Turbo87

src/background_jobs.rs

@@ -10,7 +10,6 @@ use crate::db::ConnectionPool;
 use crate::storage::Storage;
 use crate::swirl::errors::EnqueueError;
 use crate::swirl::PerformError;
-use crate::uploaders::Uploader;
 use crate::worker;
 use crate::worker::cloudfront::CloudFront;
 use crate::worker::fastly::Fastly;
@@ -294,7 +293,6 @@ pub struct RenderAndUploadReadmeJob {
 
 pub struct Environment {
     index: Arc<Mutex<Repository>>,
-    pub uploader: Uploader,
     http_client: AssertUnwindSafe<Client>,
     cloudfront: Option<CloudFront>,
     fastly: Option<Fastly>,
@@ -304,15 +302,13 @@ pub struct Environment {
 impl Environment {
     pub fn new(
         index: Repository,
-        uploader: Uploader,
         http_client: Client,
         cloudfront: Option<CloudFront>,
         fastly: Option<Fastly>,
         storage: Arc<Storage>,
     ) -> Self {
         Self::new_shared(
             Arc::new(Mutex::new(index)),
-            uploader,
             http_client,
             cloudfront,
             fastly,
@@ -322,15 +318,13 @@ impl Environment {
 
     pub fn new_shared(
         index: Arc<Mutex<Repository>>,
-        uploader: Uploader,
         http_client: Client,
         cloudfront: Option<CloudFront>,
         fastly: Option<Fastly>,
         storage: Arc<Storage>,
     ) -> Self {
         Self {
             index,
-            uploader,
             http_client: AssertUnwindSafe(http_client),
             cloudfront,
             fastly,

src/bin/background-worker.rs

@@ -40,7 +40,6 @@ fn main() {
     info!("Booting runner");
 
     let config = config::Server::default();
-    let uploader = config.base.uploader();
 
     if config.db.are_all_read_only() {
         loop {
@@ -83,14 +82,7 @@ fn main() {
         .build()
         .expect("Couldn't build client");
 
-    let environment = Environment::new_shared(
-        repository,
-        uploader.clone(),
-        client,
-        cloudfront,
-        fastly,
-        storage,
-    );
+    let environment = Environment::new_shared(repository, client, cloudfront, fastly, storage);
 
     let environment = Arc::new(Some(environment));
 

src/tests/util/test_app.rs

@@ -259,7 +259,6 @@ impl TestAppBuilder {
             let index = WorkerRepository::open(&repository_config).expect("Could not clone index");
             let environment = Environment::new(
                 index,
-                app.config.uploader().clone(),
                 app.http_client().clone(),
                 None,
                 None,