fix test and default trait for `PublisherPricingPref~

crates/core_app_cli/src/actions/list_all_my_happs.rs

@@ -3,6 +3,7 @@ use holochain_types::prelude::{
     holochain_serial, ActionHashB64, AgentPubKeyB64, ExternIO, FunctionName, SerializedBytes,
     ZomeName,
 };
+use holofuel_types::fuel::Fuel;
 use hpos_hc_connect::{CoreAppAgent, CoreAppRoleName};
 use serde::{Deserialize, Serialize};
 

crates/holo_happ_manager/Cargo.toml

@@ -21,6 +21,7 @@ tracing-subscriber = "0.3.17"
 tokio = "1.28.2"
 url2 = "0.0.6"
 hpos-config-core = { git = "https://github.com/Holo-Host/hpos-config", rev = "bfaced6044ae570bf20d4528fa9aaafcc43ddeec" }
+holofuel_types = "0.5.0"
 
 [dev-dependencies]
 configure-holochain = { path = "../configure-holochain"}

crates/holo_happ_manager/src/hha_type.rs

@@ -1,4 +1,5 @@
 use holochain_types::prelude::{holochain_serial, SerializedBytes};
+use holofuel_types::fuel::Fuel;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone)]
@@ -18,11 +19,11 @@ pub struct HappInput {
     #[serde(default)]
     pub description: String,
     #[serde(default)]
-    pub categories: Vec<String>, //
+    pub categories: Vec<String>,
     #[serde(default)]
-    pub jurisdictions: Vec<String>, //
+    pub jurisdictions: Vec<String>,
     #[serde(default)]
-    pub exclude_jurisdictions: bool, //
+    pub exclude_jurisdictions: bool,
     #[serde(default)]
     pub publisher_pricing_pref: PublisherPricingPref,
     #[serde(default)]
@@ -31,22 +32,32 @@ pub struct HappInput {
     pub uid: Option<String>,
 }
 
+#[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone)]
+pub struct DnaResource {
+    pub hash: String, // hash of the dna, not a stored dht address
+    pub src_url: String,
+    pub nick: String,
+}
+
 #[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone, Default)]
 pub struct LoginConfig {
     pub display_publisher_name: bool,
     pub registration_info_url: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone)]
 pub struct PublisherPricingPref {
     pub cpu: Fuel,
     pub storage: Fuel,
     pub bandwidth: Fuel,
 }
 
-#[derive(Debug, Serialize, Deserialize, SerializedBytes, Clone)]
-pub struct DnaResource {
-    pub hash: String, // hash of the dna, not a stored dht address
-    pub src_url: String,
-    pub nick: String,
+impl Default for PublisherPricingPref {
+    fn default() -> Self {
+        Self {
+            cpu: Fuel::new(0),
+            storage: Fuel::new(0),
+            bandwidth: Fuel::new(0),
+        }
+    }
 }