fix: allocator json creation | bump version 1.3.0

AlexMCon · AlexMCon · commit 6d4c298f116c · 2024-03-13T16:46:33.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fplus-database/Cargo.toml b/fplus-database/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fplus-database"
 authors = ["clriesco", "kokal33", "alexmcon"]
-version = "1.0.23"
+version = "1.3.0"
 edition = "2021"
 description = "FPlus main database module"
 license = "MIT OR Apache-2.0"
diff --git a/fplus-http-server/Cargo.toml b/fplus-http-server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fplus-http-server"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.0.23"
+version = "1.3.0"
 description = "FPlus main http module"
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -22,8 +22,8 @@ actix-cors = "0.6.4"
 reqwest = { version = "0.11.18", features = ["json"] }
 futures = "0.3.28"
 dotenv = "0.15.0"
-fplus-lib = { path = "../fplus-lib", version = "1.0.23" }
-fplus-database = { path = "../fplus-database", version = "1.0.23"}
+fplus-lib = { path = "../fplus-lib", version = "1.3.0" }
+fplus-database = { path = "../fplus-database", version = "1.3.0"}
 anyhow = "1.0.75"
 async-trait = "0.1.73"
 uuidv4 = "1.0.0"
diff --git a/fplus-lib/Cargo.toml b/fplus-lib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fplus-lib"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.0.23"
+version = "1.3.0"
 edition = "2021"
 description = "FPlus library/helper files"
 license = "MIT OR Apache-2.0"
@@ -30,6 +30,6 @@ uuidv4 = "1.0.0"
 rayon = "1.8.0" 
 log = "0.4.20"
 once_cell = "1.19.0"
-fplus-database = { path = "../fplus-database", version = "1.0.23"}
+fplus-database = { path = "../fplus-database", version = "1.3.0"}
 pem = "1.0"
 anyhow = "1.0"
diff --git a/fplus-lib/src/base64.rs b/fplus-lib/src/base64.rs
@@ -23,6 +23,9 @@ pub fn decode_allocator_model(encoded_str: &str) -> Option<AllocatorModel> {
 
     match from_reader(decoder) {
         Ok(model) => Some(model),
-        Err(_) => None,
+        Err(e) => {
+            log::error!("Error decoding allocator model: {}", e.to_string());
+            return None
+        },
     }
 }
diff --git a/fplus-lib/src/core/allocator/file.rs b/fplus-lib/src/core/allocator/file.rs
@@ -9,8 +9,6 @@ pub struct AllocatorModel {
     #[serde(rename = "address")]
     pub multisig_address: String,
     pub application: Application,
-    #[serde(rename = "common_ui_install_id")]
-    pub installation_id: u64, 
     #[serde(rename = "multisig_threshold")]
     pub multisig_threshold: Option<i32>,
 }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ pub fn decode_allocator_model(encoded_str: &str) -> Option<AllocatorModel> {`
`23`	`23`
`24`	`24`	`match from_reader(decoder) {`
`25`	`25`	`Ok(model) => Some(model),`
`26`		`- Err(_) => None,`
	`26`	`+ Err(e) => {`
	`27`	`+ log::error!("Error decoding allocator model: {}", e.to_string());`
	`28`	`+ return None`
	`29`	`+ },`
`27`	`30`	`}`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@ pub struct AllocatorModel {`
`9`	`9`	`#[serde(rename = "address")]`
`10`	`10`	`pub multisig_address: String,`
`11`	`11`	`pub application: Application,`
`12`		`- #[serde(rename = "common_ui_install_id")]`
`13`		`- pub installation_id: u64,`
`14`	`12`	`#[serde(rename = "multisig_threshold")]`
`15`	`13`	`pub multisig_threshold: Option<i32>,`
`16`	`14`	`}`