fix(plugin): fix the option conversion

Signed-off-by: Vincenzo Palazzo <[email protected]>

plugin/examples/foo_plugin.rs

@@ -46,7 +46,7 @@ fn main() {
         .add_opt(
             "foo",
             "flag",
-            None,
+            Some("false".to_owned()),
             "An example of command line option",
             false,
         )

plugin/src/commands/builtin.rs

@@ -5,24 +5,22 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use crate::commands::{
-    types::{RPCHookInfo, RPCMethodInfo},
-    RPCCommand,
-};
+use serde_json::Value;
+
+use clightningrpc_common::json_utils::{add_bool, add_vec, init_payload};
+
+use crate::commands::types::{InitConf, RPCHookInfo, RPCMethodInfo};
+use crate::commands::RPCCommand;
 use crate::errors::PluginError;
 use crate::plugin::Plugin;
 use crate::types::RpcOption;
-use clightningrpc_common::json_utils::{add_bool, add_vec, init_payload};
-use serde_json::Value;
-
-use super::types::InitConf;
 
-#[derive(Clone)]
 /// Type to define the manifest method and its attributes, used during plugin initialization
+#[derive(Clone)]
 pub struct ManifestRPC {}
 
 impl<T: Clone> RPCCommand<T> for ManifestRPC {
-    fn call<'c>(&self, plugin: &mut Plugin<T>, _request: Value) -> Result<Value, PluginError> {
+    fn call<'c>(&self, plugin: &mut Plugin<T>, _: Value) -> Result<Value, PluginError> {
         let mut response = init_payload();
         add_vec::<RpcOption>(
             &mut response,

plugin/src/plugin.rs

@@ -137,6 +137,14 @@ impl<'a, T: 'a + Clone> Plugin<T> {
         description: &str,
         deprecated: bool,
     ) -> &mut Self {
+        let def_val = match opt_type {
+            "flag" | "bool" => {
+                def_val.and_then(|val| Some(serde_json::json!(val.parse::<bool>().unwrap())))
+            }
+            "int" => def_val.and_then(|val| Some(serde_json::json!(val.parse::<i64>().unwrap()))),
+            "string" => def_val.and_then(|val| Some(serde_json::json!(val))),
+            _ => unreachable!("{opt_type} not supported"),
+        };
         self.option.insert(
             name.to_owned(),
             RpcOption {

plugin/src/types.rs

@@ -13,7 +13,7 @@ pub struct RpcOption {
     pub opt_typ: String,
     /// default value, that can be specified only as string
     /// and core lightning will convert it for you :) smart right?
-    pub default: Option<String>,
+    pub default: Option<serde_json::Value>,
     /// description of the option that is shows to the user
     /// when lightningd --help is typed
     pub description: String,

plugin_macros/examples/macros_ex.rs

@@ -29,8 +29,8 @@ pub fn foo_rpc(plugin: &mut Plugin<State>, request: Value) -> Result<Value, Plug
     Ok(response)
 }
 
-#[notification(on = "rpc_command")]
-fn on_rpc(plugin: &mut Plugin<State>, request: &Value) {
+#[notification(on = "warning")]
+fn on_warning(plugin: &mut Plugin<State>, request: &Value) {
     use clightningrpc_plugin::types::LogLevel;
     plugin.log(LogLevel::Info, "received an RPC notification");
 }
@@ -40,7 +40,7 @@ fn main() {
         state: State::new(),
         dynamic: true,
         notification: [
-            on_rpc,
+            on_warning,
         ],
         methods: [
             foo_rpc,

testing/Cargo.toml

@@ -10,4 +10,4 @@ log = "^0.4"
 tempfile = "3.6.0"
 port-selector = "0.1.6"
 anyhow = "1.0.71"
-tokio = { version = "1.22.0", features = ["process", "time", "fs"] }
+tokio = { version = "1.22.0", features = ["process", "time", "fs", "io-util"] }

testing/src/cln.rs

@@ -14,8 +14,6 @@ pub mod macros {
     macro_rules! lightningd {
         ($dir:expr, $port:expr, $($opt_args:tt)*) => {
             async {
-                use std::process::Stdio;
-
                 use tokio::process::Command;
 
                 let opt_args = format!($($opt_args)*);
@@ -31,9 +29,11 @@ pub mod macros {
                     .arg(format!("--addr=127.0.0.1:{}", $port))
                     .arg(format!("--bind-addr=127.0.0.1:{}", $port + 1))
                     .arg(format!("--lightning-dir={path}"))
+                    .arg("--developer")
                     .arg("--dev-fast-gossip")
                     .arg("--funding-confirms=1")
-                    .stdout(Stdio::null())
+                    .arg(format!("--log-file={path}/log.log"))
+                    .stdout(std::process::Stdio::null())
                     .spawn()
             }.await
         };
@@ -117,6 +117,8 @@ impl Node {
         self.inner.clone()
     }
 
+    // FIXME: add a method to print the log file
+
     pub fn btc(&self) -> Arc<BtcNode> {
         self.bitcoin.clone()
     }

tests/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 clightning-testing = { path = "../testing" }
 tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] }
+log = "*"
 env_logger = "0.11.1"
 serde_json = "1.0.1"
 anyhow = "1.0.71"

tests/src/lib.rs

@@ -27,9 +27,8 @@ macro_rules! async_run {
 
 pub mod fixtures {
 
-    use rstest::*;
-
     use clightning_testing::cln;
+    use rstest::*;
 
     use super::{async_run, init};
 

tests/src/test_rpc.rs

@@ -89,7 +89,6 @@ fn generate_invoice_with_description_hash(lightningd: cln::Node) {
             Some(true),
         )
         .unwrap();
-    println!("{:?}", invoice);
     let decode = lightningd.decodepay(&invoice.bolt11, None).unwrap();
     assert_eq!(decode.amount_msat, Some(MSat(1)));
     assert_eq!(