From fcfc1d5e8145993a4500c26a597254dac59e49a9 Mon Sep 17 00:00:00 2001
From: scx1332 <sieciech.czajka@golem.network>
Date: Tue, 27 Aug 2024 20:47:49 +0200
Subject: [PATCH] Fix timeout parsing error in payment REST API.

---
 Cargo.lock                       |  4 ++--
 Cargo.toml                       |  4 ++--
 core/payment/src/api/payments.rs | 11 ++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69fe9a0d9c..b3af8f008f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8757,7 +8757,7 @@ dependencies = [
 [[package]]
 name = "ya-client"
 version = "0.8.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=a2fa0d54fe47a013add90b7ae687afe4f08ce7a2#a2fa0d54fe47a013add90b7ae687afe4f08ce7a2"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1#fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1"
 dependencies = [
  "actix-codec",
  "awc",
@@ -8781,7 +8781,7 @@ dependencies = [
 [[package]]
 name = "ya-client-model"
 version = "0.6.0"
-source = "git+https://github.com/golemfactory/ya-client.git?rev=a2fa0d54fe47a013add90b7ae687afe4f08ce7a2#a2fa0d54fe47a013add90b7ae687afe4f08ce7a2"
+source = "git+https://github.com/golemfactory/ya-client.git?rev=fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1#fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1"
 dependencies = [
  "bigdecimal 0.2.2",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index d0a44fd20f..5139af7233 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -287,9 +287,9 @@ ya-service-api-interfaces = { path = "core/serv-api/interfaces" }
 ya-service-api-web = { path = "core/serv-api/web" }
 
 ## CLIENT
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "a2fa0d54fe47a013add90b7ae687afe4f08ce7a2" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1" }
 #ya-client = { path = "../ya-client" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "a2fa0d54fe47a013add90b7ae687afe4f08ce7a2" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "fbb15b49f8b9635cf3c3e2351ba6a9879f3b62d1" }
 #ya-client-model = { path = "../ya-client/model" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 
diff --git a/core/payment/src/api/payments.rs b/core/payment/src/api/payments.rs
index 511311421e..38597413cb 100644
--- a/core/payment/src/api/payments.rs
+++ b/core/payment/src/api/payments.rs
@@ -30,11 +30,8 @@ async fn get_payments(
     id: Identity,
 ) -> HttpResponse {
     let node_id = id.identity;
-    let timeout_secs = query
-        .event_params
-        .timeout
-        .unwrap_or(params::DEFAULT_EVENT_TIMEOUT);
-    let after_timestamp = query.event_params.after_timestamp.map(|d| d.naive_utc());
+    let timeout_secs = query.timeout.unwrap_or(params::DEFAULT_EVENT_TIMEOUT);
+    let after_timestamp = query.after_timestamp.map(|d| d.naive_utc());
     let network = match query
         .network
         .as_ref()
@@ -53,8 +50,8 @@ async fn get_payments(
         Ok(driver) => driver,
         Err(e) => return response::server_error(&e),
     };
-    let max_events = query.event_params.max_events;
-    let app_session_id = &query.event_params.app_session_id;
+    let max_events = query.max_events;
+    let app_session_id = &query.app_session_id;
 
     let dao: PaymentDao = db.as_dao();
     let getter = || async {