Remove handle_defaults

This function is left over from `bitcoincore-rpc`, we don't need to
handle defaults like this - just remove the function.

Author: tcharding

client/src/client_sync/mod.rs

@@ -184,54 +184,6 @@ fn empty_arr() -> serde_json::Value { serde_json::Value::Array(vec![]) }
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
 fn empty_obj() -> serde_json::Value { serde_json::Value::Object(Default::default()) }
 
-/// Handle default values in the argument list.
-///
-/// Substitute `Value::Null`s with corresponding values from `defaults` table, except when they are
-/// trailing, in which case just skip them altogether in returned list.
-///
-/// Note, that `defaults` corresponds to the last elements of `args`.
-///
-/// ```norust
-/// arg1 arg2 arg3 arg4
-///           def1 def2
-/// ```
-///
-/// Elements of `args` without corresponding `defaults` value, won't be substituted, because they
-/// are required.
-#[allow(dead_code)] // TODO: Remove this if unused still when we are done.
-fn handle_defaults<'a>(
-    args: &'a mut [serde_json::Value],
-    defaults: &[serde_json::Value],
-) -> &'a [serde_json::Value] {
-    assert!(args.len() >= defaults.len());
-
-    // Pass over the optional arguments in backwards order, filling in defaults after the first
-    // non-null optional argument has been observed.
-    let mut first_non_null_optional_idx = None;
-    for i in 0..defaults.len() {
-        let args_i = args.len() - 1 - i;
-        let defaults_i = defaults.len() - 1 - i;
-        if args[args_i] == serde_json::Value::Null {
-            if first_non_null_optional_idx.is_some() {
-                if defaults[defaults_i] == serde_json::Value::Null {
-                    panic!("Missing `default` for argument idx {}", args_i);
-                }
-                args[args_i] = defaults[defaults_i].clone();
-            }
-        } else if first_non_null_optional_idx.is_none() {
-            first_non_null_optional_idx = Some(args_i);
-        }
-    }
-
-    let required_num = args.len() - defaults.len();
-
-    if let Some(i) = first_non_null_optional_idx {
-        &args[..i + 1]
-    } else {
-        &args[..required_num]
-    }
-}
-
 /// Convert a possible-null result into an `Option`.
 #[allow(dead_code)] // TODO: Remove this if unused still when we are done.
 fn opt_result<T: for<'a> serde::de::Deserialize<'a>>(

client/src/client_sync/v17/mod.rs

@@ -15,7 +15,7 @@ use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 use serde::{Deserialize, Serialize};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v17::*;
 
 crate::define_jsonrpc_minreq_client!("v17");

client/src/client_sync/v17/wallet.rs

@@ -103,8 +103,8 @@ macro_rules! impl_client_v17__sendtoaddress {
                 address: &Address<NetworkChecked>,
                 amount: Amount,
             ) -> Result<SendToAddress> {
-                let mut args = [address.to_string().into(), into_json(amount.to_btc())?];
-                self.call("sendtoaddress", handle_defaults(&mut args, &["".into(), "".into()]))
+                let args = [address.to_string().into(), into_json(amount.to_btc())?];
+                self.call("sendtoaddress", &args)
             }
         }
     };

client/src/client_sync/v18.rs

@@ -7,7 +7,7 @@
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v18::*;
 
 crate::define_jsonrpc_minreq_client!("v18");

client/src/client_sync/v19/mod.rs

@@ -9,7 +9,7 @@ mod wallet;
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v19::*;
 
 crate::define_jsonrpc_minreq_client!("v19");

client/src/client_sync/v20.rs

@@ -7,7 +7,7 @@
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v20::*;
 
 crate::define_jsonrpc_minreq_client!("v20");

client/src/client_sync/v21.rs

@@ -7,7 +7,7 @@
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v21::*;
 
 crate::define_jsonrpc_minreq_client!("v21");

client/src/client_sync/v22/mod.rs

@@ -9,7 +9,7 @@ mod wallet;
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v22::*;
 
 crate::define_jsonrpc_minreq_client!("v22");

client/src/client_sync/v23.rs

@@ -8,7 +8,7 @@ use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 use serde::{Deserialize, Serialize};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v23::*;
 
 crate::define_jsonrpc_minreq_client!("v23");

client/src/client_sync/v24.rs

@@ -7,7 +7,7 @@
 use bitcoin::address::{Address, NetworkChecked};
 use bitcoin::{Amount, Block, BlockHash, Txid};
 
-use crate::client_sync::{handle_defaults, into_json};
+use crate::client_sync::into_json;
 use crate::types::v24::*;
 
 crate::define_jsonrpc_minreq_client!("v24");