فهرست منبع

drk: display mining configuration address right away

skoupidi 7 ماه پیش
والد
کامیت
021c8927d7
3فایلهای تغییر یافته به همراه3 افزوده شده و 21 حذف شده
  1. 1 1
      bin/drk/src/cli_util.rs
  2. 1 5
      bin/drk/src/dao.rs
  3. 1 15
      bin/drk/src/money.rs

+ 1 - 1
bin/drk/src/cli_util.rs

@@ -686,7 +686,7 @@ pub fn display_mining_config(
     user_data: &Option<String>,
     output: &mut Vec<String>,
 ) {
-    output.push(format!("Mining configuration: {config}"));
+    output.push(format!("DarkFi mining configuration address: {config}"));
 
     match Address::from_str(recipient_str) {
         Ok(recipient) => {

+ 1 - 5
bin/drk/src/dao.rs

@@ -1923,11 +1923,7 @@ impl Drk {
                 .to_func_id()
         );
         let user_data = bs58::encode(dao.bulla().inner().to_repr()).into_string();
-        output.push(String::from("DarkFi TOML configuration:"));
-        output.push(format!("recipient = \"{recipient}\""));
-        output.push(format!("spend_hook = \"{spend_hook}\""));
-        output.push(format!("user_data = \"{user_data}\""));
-        output.push(String::from("\nP2Pool wallet address to use:"));
+        output.push(String::from("DarkFi DAO mining configuration address:"));
         output.push(
             base64::encode(&serialize(&(recipient, Some(spend_hook), Some(user_data)))).to_string(),
         );

+ 1 - 15
bin/drk/src/money.rs

@@ -291,30 +291,16 @@ impl Drk {
                 )))
             }
         };
-
         let Value::Blob(ref key_bytes) = row[0] else {
             return Err(Error::ParseFailed("[mining_address] Key bytes parsing failed"))
         };
         let public_key: PublicKey = deserialize_async(key_bytes).await?;
         let address: Address = StandardAddress::from_public(self.network, public_key).into();
         let recipient = address.to_string();
-
         let spend_hook = spend_hook.as_ref().map(|spend_hook| spend_hook.to_string());
-
         let user_data =
             user_data.as_ref().map(|user_data| bs58::encode(user_data.to_repr()).into_string());
-
-        output.push(String::from("DarkFi TOML configuration:"));
-        output.push(format!("recipient = \"{recipient}\""));
-        match spend_hook {
-            Some(ref spend_hook) => output.push(format!("spend_hook = \"{spend_hook}\"")),
-            None => output.push(String::from("#spend_hook = \"\"")),
-        }
-        match user_data {
-            Some(ref user_data) => output.push(format!("user_data = \"{user_data}\"")),
-            None => output.push(String::from("#user_data = \"\"")),
-        }
-        output.push(String::from("\nP2Pool wallet address to use:"));
+        output.push(String::from("DarkFi mining configuration address:"));
         output.push(base64::encode(&serialize(&(recipient, spend_hook, user_data))).to_string());
 
         Ok(())