Scx1332/update payment7

.github/workflows/unit-test-sgx.yml

@@ -46,4 +46,4 @@ jobs:
         working-directory: exe-unit
         run: |
           echo "TODO: fix sgx tests"
-          # cargo test --features sgx
+          # cargo test --features sgx

.gitignore

@@ -42,3 +42,9 @@ db.sqlite-wal
 
 # bak files (generated by notepad++)
 **/*.bak
+
+# Suggested debug data dirs
+yagnadir
+providerdir
+
+*.bat

Cargo.toml

@@ -192,6 +192,7 @@ arc_with_non_send_sync = "allow"
 blocks_in_conditions = "allow"
 get_first = "allow"
 doc_lazy_continuation = "allow"
+len_zero = "allow"
 
 [workspace]
 members = [
@@ -287,8 +288,8 @@ ya-sb-proto = { version = "0.6.2" }
 ya-sb-util = { version = "0.5.1" }
 parking_lot = "0.12.3"
 mime = "0.3.17"
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "653e7ed3ff8836837b660a76e604055e167b1f2e" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "653e7ed3ff8836837b660a76e604055e167b1f2e" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "b4bf2aab46181d594dcba5b6956c03172ee1f2ea" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "b4bf2aab46181d594dcba5b6956c03172ee1f2ea" }
 
 ya-compile-time-utils.path = "utils/compile-time-utils"
 ya-manifest-utils = { path = "utils/manifest-utils" }
@@ -325,8 +326,8 @@ ya-framework-basic.path = "test-utils/test-framework/framework-basic"
 ya-framework-mocks.path = "test-utils/test-framework/framework-mocks"
 
 [patch.crates-io]
-ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "653e7ed3ff8836837b660a76e604055e167b1f2e" }
-ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "653e7ed3ff8836837b660a76e604055e167b1f2e" }
+ya-client = { git = "https://github.com/golemfactory/ya-client.git", rev = "b4bf2aab46181d594dcba5b6956c03172ee1f2ea" }
+ya-client-model = { git = "https://github.com/golemfactory/ya-client.git", rev = "b4bf2aab46181d594dcba5b6956c03172ee1f2ea" }
 golem-certificate = { git = "https://github.com/golemfactory/golem-certificate.git", rev = "f2d7514c18fc066e9cfb796090b90f5b27cfe1c6" }
 ethereum-tx-sign = { git = "https://github.com/golemfactory/ethereum-tx-sign.git", rev = "1164c74187a9e2947faeaea7dde104c3cdec4195" }
 graphene-sgx = { git = " https://github.com/golemfactory/graphene-rust.git", rev = "dbd993ebad7f9190410ea390a589348479af6407" }

core/activity/src/error.rs

@@ -117,7 +117,7 @@ impl ResponseError for Error {
             }
             _ => {
                 let e = self.to_string();
-                log::error!("Activity API server error: {}", e);
+                //log::error!("Activity API server error: {}", e);
                 HttpResponse::InternalServerError().json(ErrorMessage::new(e))
             }
         }

core/model/src/driver.rs

@@ -5,7 +5,10 @@ use derive_more::From;
 use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 use std::time::Duration;
-use ya_client_model::payment::{allocation::Deposit, Allocation, DriverStatusProperty, Payment};
+use ya_client_model::payment::{
+    allocation::Allocation, allocation::Deposit, DriverStatusProperty, Payment,
+};
+use ya_client_model::NodeId;
 use ya_service_bus::RpcMessage;
 
 pub fn driver_bus_id<T: Display>(driver_name: T) -> String {
@@ -296,6 +299,43 @@ impl RpcMessage for Init {
     type Error = GenericError;
 }
 
+// ************************** FLUSH PAYMENTS **************************
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct FlushPayments {
+    node_id: Option<NodeId>,
+    flush_date: DateTime<Utc>,
+}
+
+impl FlushPayments {
+    pub fn new(node_id: Option<NodeId>, flush_date: DateTime<Utc>) -> FlushPayments {
+        FlushPayments {
+            node_id,
+            flush_date,
+        }
+    }
+
+    pub fn flush_date(&self) -> DateTime<Utc> {
+        self.flush_date
+    }
+
+    pub fn node_id(&self) -> Option<NodeId> {
+        self.node_id
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub enum FlushPaymentResult {
+    FlushScheduled,
+    FlushNotNeeded,
+}
+
+impl RpcMessage for FlushPayments {
+    const ID: &'static str = "FlushPayments";
+    type Item = FlushPaymentResult;
+    type Error = GenericError;
+}
+
 // ************************** SCHEDULE PAYMENT **************************
 
 #[derive(Clone, Debug, Serialize, Deserialize)]