Merge pull request #85 from tweedegolf/rework-client-ref

Rework client ref

openadr-client/Cargo.toml

@@ -30,3 +30,4 @@ uuid.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["full", "test-util"] }
+openadr-vtn = { path = "../openadr-vtn" }

openadr-client/src/bin/cli.rs

@@ -5,10 +5,7 @@ use openadr_wire::program::ProgramContent;
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let client = openadr_client::Client::with_url(
         "http://localhost:3000/".try_into()?,
-        Some(ClientCredentials::new(
-            "admin".to_string(),
-            "admin".to_string(),
-        )),
+        Some(ClientCredentials::admin()),
     );
     let _created_program = client.create_program(ProgramContent::new("name")).await?;
     // let created_program_1 = client.create_program(ProgramContent::new("name1")).await?;

openadr-client/src/bin/everest.rs

@@ -4,7 +4,7 @@ use openadr_wire::{
     values_map::Value,
 };
 
-use openadr_client::{ClientRef, ProgramClient, Target, Timeline};
+use openadr_client::{ProgramClient, Target, Timeline};
 use std::{error::Error, time::Duration};
 use tokio::sync::mpsc::{Receiver, Sender};
 use tokio::{select, sync::mpsc};
@@ -59,7 +59,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 }
 
 async fn poll_timeline(
-    mut program: ProgramClient<impl ClientRef>,
+    mut program: ProgramClient,
     poll_interval: std::time::Duration,
     sender: mpsc::Sender<Timeline>,
 ) -> Result<(), openadr_client::Error> {

openadr-client/src/event.rs

@@ -11,13 +11,13 @@ use openadr_wire::{
 };
 
 #[derive(Debug)]
-pub struct EventClient<C> {
-    client: Arc<C>,
+pub struct EventClient {
+    client: Arc<ClientRef>,
     data: Event,
 }
 
-impl<C: ClientRef> EventClient<C> {
-    pub(super) fn from_event(client: Arc<C>, event: Event) -> Self {
+impl EventClient {
+    pub(super) fn from_event(client: Arc<ClientRef>, event: Event) -> Self {
         Self {
             client,
             data: event,
@@ -75,7 +75,7 @@ impl<C: ClientRef> EventClient<C> {
     }
 
     /// Create a new report for the event
-    pub async fn create_report(&self, report_data: ReportContent) -> Result<ReportClient<C>> {
+    pub async fn create_report(&self, report_data: ReportContent) -> Result<ReportClient> {
         if report_data.program_id != self.data().program_id {
             return Err(Error::InvalidParentObject);
         }
@@ -93,7 +93,7 @@ impl<C: ClientRef> EventClient<C> {
         client_name: Option<&str>,
         skip: usize,
         limit: usize,
-    ) -> Result<Vec<ReportClient<C>>> {
+    ) -> Result<Vec<ReportClient>> {
         let skip_str = skip.to_string();
         let limit_str = limit.to_string();
 
@@ -116,7 +116,7 @@ impl<C: ClientRef> EventClient<C> {
     }
 
     /// Get all reports from the VTN for a specific client, trying to paginate whenever possible
-    pub async fn get_client_reports(&self, client_name: &str) -> Result<Vec<ReportClient<C>>> {
+    pub async fn get_client_reports(&self, client_name: &str) -> Result<Vec<ReportClient>> {
         let page_size = self.client.default_page_size();
         let mut reports = vec![];
         let mut page = 0;
@@ -140,7 +140,7 @@ impl<C: ClientRef> EventClient<C> {
     }
 
     /// Get all reports from the VTN, trying to paginate whenever possible
-    pub async fn get_all_reports(&self) -> Result<Vec<ReportClient<C>>> {
+    pub async fn get_all_reports(&self) -> Result<Vec<ReportClient>> {
         let page_size = self.client.default_page_size();
         let mut reports = vec![];
         let mut page = 0;