refactor(actors): rename BootstrapActor to Bootstrapper

server/crates/arbiter-server/src/actors/bootstrap.rs

@@ -43,11 +43,11 @@ pub enum BootstrapError {
 }
 
 #[derive(Actor)]
-pub struct BootstrapActor {
+pub struct Bootstrapper {
     token: Option<String>,
 }
 
-impl BootstrapActor {
+impl Bootstrapper {
     pub async fn new(db: &DatabasePool) -> Result<Self, BootstrapError> {
         let mut conn = db.get().await?;
 
@@ -77,7 +77,7 @@ impl BootstrapActor {
 }
 
 #[messages]
-impl BootstrapActor {
+impl Bootstrapper {
     #[message]
     pub fn is_correct_token(&self, token: String) -> bool {
         match &self.token {

server/crates/arbiter-server/src/actors/user_agent.rs

@@ -29,7 +29,7 @@ use x25519_dalek::{EphemeralSecret, PublicKey};
 use crate::{
     ServerContext,
     actors::{
-        bootstrap::{BootstrapActor, ConsumeToken},
+        bootstrap::{Bootstrapper, ConsumeToken},
         user_agent::state::{
             AuthRequestContext, ChallengeContext, DummyContext, UnsealContext, UserAgentEvents,
             UserAgentStateMachine, UserAgentStates,
@@ -49,7 +49,7 @@ pub(crate) use transport::handle_user_agent;
 #[derive(Actor)]
 pub struct UserAgentActor {
     db: db::DatabasePool,
-    bootstapper: ActorRef<BootstrapActor>,
+    bootstapper: ActorRef<Bootstrapper>,
     state: UserAgentStateMachine<DummyContext>,
     // will be used in future
     _tx: Sender<Result<UserAgentResponse, Status>>,
@@ -71,7 +71,7 @@ impl UserAgentActor {
     #[cfg(test)]
     pub(crate) fn new_manual(
         db: db::DatabasePool,
-        bootstapper: ActorRef<BootstrapActor>,
+        bootstapper: ActorRef<Bootstrapper>,
         tx: Sender<Result<UserAgentResponse, Status>>,
     ) -> Self {
         Self {

server/crates/arbiter-server/src/actors/user_agent/tests.rs

@@ -11,7 +11,7 @@ use kameo::actor::Spawn;
 
 use crate::{
     actors::{
-        bootstrap::BootstrapActor,
+        bootstrap::Bootstrapper,
         user_agent::{HandleAuthChallengeRequest, HandleAuthChallengeSolution},
     },
     db::{self, schema},
@@ -24,10 +24,10 @@ use super::UserAgentActor;
 pub async fn test_bootstrap_token_auth() {
     let db = db::create_test_pool().await;
     // explicitly not installing any user_agent pubkeys
-    let bootstrapper = BootstrapActor::new(&db).await.unwrap(); // this will create bootstrap token
+    let bootstrapper = Bootstrapper::new(&db).await.unwrap(); // this will create bootstrap token
     let token = bootstrapper.get_token().unwrap();
 
-    let bootstrapper_ref = BootstrapActor::spawn(bootstrapper);
+    let bootstrapper_ref = Bootstrapper::spawn(bootstrapper);
     let user_agent = UserAgentActor::new_manual(
         db.clone(),
         bootstrapper_ref,
@@ -78,9 +78,9 @@ pub async fn test_bootstrap_token_auth() {
 pub async fn test_bootstrap_invalid_token_auth() {
     let db = db::create_test_pool().await;
     // explicitly not installing any user_agent pubkeys
-    let bootstrapper = BootstrapActor::new(&db).await.unwrap(); // this will create bootstrap token
+    let bootstrapper = Bootstrapper::new(&db).await.unwrap(); // this will create bootstrap token
 
-    let bootstrapper_ref = BootstrapActor::spawn(bootstrapper);
+    let bootstrapper_ref = Bootstrapper::spawn(bootstrapper);
     let user_agent = UserAgentActor::new_manual(
         db.clone(),
         bootstrapper_ref,
@@ -126,7 +126,7 @@ pub async fn test_bootstrap_invalid_token_auth() {
 pub async fn test_challenge_auth() {
     let db = db::create_test_pool().await;
 
-    let bootstrapper_ref = BootstrapActor::spawn(BootstrapActor::new(&db).await.unwrap());
+    let bootstrapper_ref = Bootstrapper::spawn(Bootstrapper::new(&db).await.unwrap());
     let user_agent = UserAgentActor::new_manual(
         db.clone(),
         bootstrapper_ref,