Yarapi compiles with event-api/master on ya-client

Author: nieznany.sprawiciel

.gitignore

@@ -0,0 +1,3 @@
+.idea
+target
+tests/test-workdir/*

Cargo.lock

@@ -12,7 +12,7 @@ keywords=["golem", "yagna"]
 
 
 [dependencies]
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "cf9838499aaeb2a54c4ad56d1601c4579a66e7cc", features = ["sgx"] }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "29f9b7a60044d56c6665b5d236696bf1830aacdd", features = ["sgx"] }
 gftp = "0.1"
 ya-agreement-utils = "0.1"
 

Cargo.toml

@@ -79,6 +79,7 @@ async fn do_init(activity: impl rest::Activity) -> anyhow::Result<()> {
                     "aea5db67524e02a263b9339fe6667d6b577f3d4c".to_string(),
                     "1".to_string(),
                 ],
+                capture: None,
             },
         ])
         .await?;

examples/low_level.rs

@@ -31,7 +31,7 @@ use ya_client::{
             AgreementProposal, NewDemand, RequestorEvent,
         },
     },
-    payment::PaymentRequestorApi,
+    payment::PaymentApi,
     web::WebClient,
 };
 
@@ -167,7 +167,7 @@ impl Requestor {
         let client = WebClient::builder().auth_token(&app_key).build();
         let market_api: MarketRequestorApi = client.interface()?;
         let activity_api: ActivityRequestorApi = client.interface()?;
-        let payment_api: PaymentRequestorApi = client.interface()?;
+        let payment_api: PaymentApi = client.interface()?;
 
         let demand = self.create_demand().await?;
         log::debug!("demand: {}", serde_json::to_string_pretty(&demand)?);
@@ -411,14 +411,8 @@ async fn create_agreement(market_api: MarketRequestorApi, proposal: Proposal) ->
     let _ = market_api.confirm_agreement(&id, None).await?;
     log::info!("waiting for approval of agreement [{}]", agreement_id);
 
-    let response = market_api.wait_for_approval(&id, Some(10.0)).await?;
-    match response.trim().to_lowercase().as_str() {
-        "approved" => Ok(agreement_id),
-        res => Err(anyhow::anyhow!(
-            "expected agreement approval, got {} instead",
-            res
-        )),
-    }
+    market_api.wait_for_approval(&id, Some(10.0)).await?;
+    Ok(agreement_id)
 }
 
 async fn monitor_activity(

src/requestor.rs

@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 
 use crate::requestor::command::{CommandList, ExeScript};
-use anyhow::{Context, Result};
+use anyhow::{anyhow, Context, Result};
 use ya_client::activity::{ActivityRequestorApi, SecureActivityRequestorApi};
 use ya_client::model::activity::{ActivityState, ExeScriptCommandResult};
 
@@ -100,6 +100,12 @@ impl Activity {
     }
 
     pub async fn get_usage(&self) -> Result<Vec<f64>> {
-        Ok(self.api.state().get_usage(&self.activity_id).await?)
+        Ok(self
+            .api
+            .state()
+            .get_usage(&self.activity_id)
+            .await?
+            .current_usage
+            .ok_or(anyhow!("None usage vector"))?)
     }
 }

src/requestor/activity.rs

@@ -3,13 +3,12 @@
 use actix::prelude::*;
 use bigdecimal::BigDecimal;
 use chrono::{DateTime, Utc};
-use futures::TryFutureExt;
 use std::collections::HashSet;
 use std::time::Duration;
-use ya_client::{model, payment::requestor::PaymentRequestorApi};
+use ya_client::{model, payment::PaymentApi};
 
 pub struct PaymentManager {
-    payment_api: PaymentRequestorApi,
+    payment_api: PaymentApi,
     allocation_id: String,
     total_amount: BigDecimal,
     amount_paid: BigDecimal,
@@ -28,7 +27,7 @@ impl Actor for PaymentManager {
 }
 
 impl PaymentManager {
-    pub fn new(payment_api: PaymentRequestorApi, allocation: model::payment::Allocation) -> Self {
+    pub fn new(payment_api: PaymentApi, allocation: model::payment::Allocation) -> Self {
         let now = Utc::now();
         PaymentManager {
             payment_api,
@@ -47,11 +46,11 @@ impl PaymentManager {
 
         let f = async move {
             let events = api
-                .get_debit_note_events(Some(&ts), Some(Duration::from_secs(60)))
+                .get_debit_note_events(Some(&ts), Some(Duration::from_secs(60)), None, None)
                 .await?;
             for event in events {
                 log::debug!("got debit note: {:?}", event);
-                ts = event.timestamp;
+                ts = event.event_date;
             }
             Ok::<_, anyhow::Error>(ts)
         }
@@ -78,16 +77,16 @@ impl PaymentManager {
 
         let f = async move {
             let events = api
-                .get_invoice_events(Some(&ts), Some(Duration::from_secs(60)))
+                .get_invoice_events(Some(&ts), Some(Duration::from_secs(60)), None, None)
                 .await?;
             let mut new_invoices = Vec::new();
             for event in events {
                 log::debug!("Got invoice: {:?}", event);
-                if event.event_type == model::payment::EventType::Received {
+                if event.event_type == model::payment::InvoiceEventType::InvoiceReceivedEvent {
                     let invoice = api.get_invoice(&event.invoice_id).await?;
                     new_invoices.push(invoice);
                 }
-                ts = event.timestamp;
+                ts = event.event_date;
             }
             Ok::<_, anyhow::Error>((ts, new_invoices))
         }
@@ -200,8 +199,8 @@ impl Handler<ReleaseAllocation> for PaymentManager {
             async move {
                 payment_api
                     .release_allocation(&allocation_id)
-                    .map_err(anyhow::Error::from)
                     .await
+                    .map_err(anyhow::Error::from)
             }
             .into_actor(self),
         )

src/requestor/payment_manager.rs

@@ -168,10 +168,10 @@ impl Proposal {
         let _ = self
             .subscription
             .api
-            .reject_proposal_with_reason(
+            .reject_proposal(
                 self.subscription.id.as_ref(),
                 self.proposal_id.as_str(),
-                Option::<Reason>::None,
+                &Option::<Reason>::None,
             )
             .await?;
         Ok(())
@@ -216,7 +216,7 @@ impl Drop for AgreementInner {
         let api = self.api.clone();
         let agreement_id = self.agreement_id.clone();
         self.drop_list.async_drop(async move {
-            api.terminate_agreement(&agreement_id, Option::<Reason>::None)
+            api.terminate_agreement(&agreement_id, &Option::<Reason>::None)
                 .await
                 .with_context(|| format!("Failed to auto destroy Agreement: {:?}", agreement_id))?;
             log::debug!(target:"yarapi::drop", "Agreement {:?} terminated", agreement_id);