Merge pull request #585 from breez/ok300-migrate-from-gl-structs

Migrate remaining pb:: dependencies to cln::*
breez · Nov 6, 2023 · e393903 · e393903
2 parents a12e372 + 3a8b63f
commit e393903
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 91 deletions.
diff --git a/libs/sdk-core/src/breez_services.rs b/libs/sdk-core/src/breez_services.rs
@@ -1056,7 +1056,7 @@ impl BreezServices {
                                       match paid_invoice_res {
                                           Ok(Some(i)) => {
                                               debug!("invoice stream got new invoice");
-                                              if let Some(gl_client::pb::incoming_payment::Details::Offchain(p)) = i.details {
+                                              if let Some(gl_client::signer::model::greenlight::incoming_payment::Details::Offchain(p)) = i.details {
                                                   let payment: Option<crate::models::Payment> = p.clone().try_into().ok();
                                                   if payment.is_some() {
                                                       let res = cloned

diff --git a/libs/sdk-core/src/greenlight/backup_transport.rs b/libs/sdk-core/src/greenlight/backup_transport.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 
 use super::node_api::Greenlight;
-use gl_client::{node, pb};
+use gl_client::{node, pb::cln};
 use std::sync::Arc;
 
 const BREEZ_SDK_DATASTORE_PATH: [&str; 2] = ["breez-sdk", "backup"];
@@ -24,8 +24,8 @@ impl BackupTransport for GLBackupTransport {
     async fn pull(&self) -> SdkResult<Option<BackupState>> {
         let key = self.gl_key();
         let mut c: node::ClnClient = self.inner.get_node_client().await?;
-        let response: pb::cln::ListdatastoreResponse = c
-            .list_datastore(pb::cln::ListdatastoreRequest { key })
+        let response: cln::ListdatastoreResponse = c
+            .list_datastore(cln::ListdatastoreRequest { key })
             .await?
             .into_inner();
         let store = response.datastore;
@@ -45,12 +45,12 @@ impl BackupTransport for GLBackupTransport {
         let key = self.gl_key();
         info!("set_value key = {:?} data length={:?}", key, hex.len());
         let mut c: node::ClnClient = self.inner.get_node_client().await?;
-        let mut mode = pb::cln::datastore_request::DatastoreMode::MustCreate;
+        let mut mode = cln::datastore_request::DatastoreMode::MustCreate;
         if version.is_some() {
-            mode = pb::cln::datastore_request::DatastoreMode::MustReplace;
+            mode = cln::datastore_request::DatastoreMode::MustReplace;
         }
         let response = c
-            .datastore(pb::cln::DatastoreRequest {
+            .datastore(cln::DatastoreRequest {
                 key,
                 string: None,
                 hex: Some(hex),