Update after merge

golemfactory · Oct 1, 2024 · 14647bc · 14647bc
1 parent c6a60ed
commit 14647bc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/core/payment/src/api/cycle.rs b/core/payment/src/api/cycle.rs
@@ -23,7 +23,9 @@ async fn get_batch_cycles(id: Identity) -> HttpResponse {
     let node_id = id.identity;
 
     let drivers = match bus::service(pay_local::BUS_ID)
-        .call(pay_local::GetDrivers {})
+        .call(pay_local::GetDrivers {
+            ignore_legacy_networks: true,
+        })
         .await
     {
         Ok(Ok(drivers)) => drivers,

diff --git a/core/payment/src/cli.rs b/core/payment/src/cli.rs
@@ -1,14 +1,14 @@
 mod rpc;
 
-use std::collections::HashMap;
+use std::collections::{BTreeMap, HashMap};
 // External crates
 use bigdecimal::BigDecimal;
 use chrono::{DateTime, Utc};
-use serde_json::{json, to_value};
+use serde_json::{json, to_value, Value};
 use std::str::FromStr;
 use std::time::{Duration, UNIX_EPOCH};
 use structopt::*;
-use ya_client_model::payment::DriverStatusProperty;
+use ya_client_model::payment::{DriverDetails, DriverStatusProperty};
 use ya_client_model::NodeId;
 use ya_core_model::payment::local::{NetworkName, ProcessBatchCycleResponse};
 
@@ -604,7 +604,11 @@ Typically operation should take less than 1 minute.
                         })
                     }
                     ProcessCommand::Info { account } => {
-                        let drivers = bus::service(pay::BUS_ID).call(pay::GetDrivers {}).await??;
+                        let drivers = bus::service(pay::BUS_ID)
+                            .call(pay::GetDrivers {
+                                ignore_legacy_networks: true,
+                            })
+                            .await??;
 
                         let node_id = if let Some(node_id) = account {
                             node_id