CredentialsProvider trait is non-Rusty

whisperfish · Jun 20, 2020 · 32852b1 · 32852b1
1 parent 4cd54da
commit 32852b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/libsignal-service-actix/src/push_service.rs b/libsignal-service-actix/src/push_service.rs
@@ -10,9 +10,9 @@ impl PushService for AwcPushService {
 }
 
 impl AwcPushService {
-    pub fn new<T: CredentialsProvider>(
+    pub fn new(
         _cfg: ServiceConfiguration,
-        _credentials: T,
+        _credentials: Credentials,
         user_agent: &str,
     ) -> Self {
         Self {

diff --git a/libsignal-service/examples/registering.rs b/libsignal-service/examples/registering.rs
@@ -34,7 +34,7 @@ async fn main() -> Result<(), Error> {
     let password = args.get_password()?;
 
     let config = ServiceConfiguration::default();
-    let credentials = StaticCredentialsProvider {
+    let credentials = Credentials {
         uuid: String::new(),
         e164: args.username,
         password,

diff --git a/libsignal-service/src/configuration.rs b/libsignal-service/src/configuration.rs
@@ -5,24 +5,8 @@ pub struct ServiceConfiguration {
     pub contact_discovery_url: Vec<String>,
 }
 
-pub trait CredentialsProvider {
-    fn get_uuid(&self) -> String;
-
-    fn get_e164(&self) -> String;
-
-    fn get_password(&self) -> String;
-}
-
-pub struct StaticCredentialsProvider {
+pub struct Credentials {
     pub uuid: String,
     pub e164: String,
     pub password: String,
 }
-
-impl CredentialsProvider for StaticCredentialsProvider {
-    fn get_uuid(&self) -> String { self.uuid.clone() }
-
-    fn get_e164(&self) -> String { self.e164.clone() }
-
-    fn get_password(&self) -> String { self.password.clone() }
-}
diff --git a/libsignal-service/src/push_service.rs b/libsignal-service/src/push_service.rs
@@ -1,4 +1,4 @@
-use crate::configuration::{CredentialsProvider, ServiceConfiguration};
+use crate::configuration::{Credentials, ServiceConfiguration};
 
 pub const CREATE_ACCOUNT_SMS_PATH: &str = "/v1/accounts/sms/code/%s?client=%s";
 pub const CREATE_ACCOUNT_VOICE_PATH: &str = "/v1/accounts/voice/code/%s";
@@ -66,9 +66,9 @@ pub struct PanicingPushService;
 impl PanicingPushService {
     /// A PushService implementation typically takes a ServiceConfiguration,
     /// credentials and a user agent.
-    pub fn new<T: CredentialsProvider>(
+    pub fn new(
         _cfg: ServiceConfiguration,
-        _credentials: T,
+        _credentials: Credentials,
         _user_agent: &str,
     ) -> Self {
         Self