lightningd: remove json_close force option.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Removed: JSON: `close` `force` parameter removed (deprecated in 0.7.2.1)

lightningd/peer_control.c

@@ -1271,61 +1271,6 @@ command_find_channel(struct command *cmd,
 	}
 }
 
-/* param_tok_timeout_or_force and param_tok_dest_or_timeout are made to
- * support 'check' command for array type parameters.
- *
- * But the parameters are mixed with the old style and new style(like
- * close {id} {force} {destination}), 'check' is unable to tell the error.
- */
-static struct command_result *param_tok_timeout_or_force(
-					struct command *cmd, const char *name,
-					const char *buffer, const jsmntok_t * tok,
-					const jsmntok_t **out)
-{
-	if (command_check_only(cmd)) {
-		unsigned int timeout;
-		bool force;
-		if (!json_to_bool(buffer, tok, &force)) {
-			if (!json_to_number(buffer, tok, &timeout))
-				return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-						    "Expected unilerataltimeout to be a number");
-		}
-		return NULL;
-	}
-
-	*out = tok;
-	return NULL;
-}
-
-static struct command_result *param_tok_dest_or_timeout(
-					struct command *cmd, const char *name,
-					const char *buffer, const jsmntok_t * tok,
-					const jsmntok_t **out)
-{
-	if (command_check_only(cmd)) {
-		unsigned int timeout;
-		const u8 *script;
-		if (!json_to_number(buffer, tok, &timeout)) {
-			enum address_parse_result res;
-			res = json_to_address_scriptpubkey(cmd,
-							   chainparams,
-							   buffer, tok,
-							   &script);
-			if (res == ADDRESS_PARSE_UNRECOGNIZED)
-				return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-						    "Could not parse destination address");
-			else if (res == ADDRESS_PARSE_WRONG_NETWORK)
-				return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-						    "Destination address is not on network %s",
-						    chainparams->network_name);
-		}
-		return NULL;
-	}
-
-	*out = tok;
-	return NULL;
-}
-
 static struct command_result *json_close(struct command *cmd,
 					 const char *buffer,
 					 const jsmntok_t *obj UNNEEDED,
@@ -1338,140 +1283,17 @@ static struct command_result *json_close(struct command *cmd,
 	bool force = true;
 	bool do_timeout;
 	const u8 *close_to_script = NULL;
-	unsigned int *old_timeout;
+	bool close_script_set;
-	bool *old_force, close_script_set;
 
-	/* For generating help, give new-style. */
-	if (!params || !deprecated_apis) {
 	if (!param(cmd, buffer, params,
 		   p_req("id", param_tok, &idtok),
-			   p_opt_def("unilateraltimeout", param_number,
+		   p_opt_def("unilateraltimeout", param_number, &timeout,
-				     &timeout, 48 * 3600),
+			     48 * 3600),
-			   p_opt("destination", param_bitcoin_address,
+		   p_opt("destination", param_bitcoin_address, &close_to_script),
-				 &close_to_script),
-			   NULL))
-			return command_param_failed();
-		do_timeout = (*timeout != 0);
-	} else if (params->type == JSMN_ARRAY) {
-		const jsmntok_t *firsttok, *secondtok;
-		bool old_style;
-
-		/* Could be new or old style; get as tok. */
- 		if (!param(cmd, buffer, params,
-			   p_req("id", param_tok, &idtok),
-			   p_opt("unilateraltimeout_or_force",
-				 param_tok_timeout_or_force, &firsttok),
-			   p_opt("destination_or_timeout",
-				 param_tok_dest_or_timeout, &secondtok),
 		   NULL))
 		return command_param_failed();
 
-		if (firsttok) {
-			/* old-style force bool? */
-			if (json_to_bool(buffer, firsttok, &force)) {
-				old_style = true;
-				timeout = tal(cmd, unsigned int);
-
-				/* Old default timeout */
-				if (!secondtok)
-					*timeout = 30;
-				else {
-					if (!json_to_number(buffer, secondtok, timeout))
-						return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-								    "close: Expected timeout to be a number. "
-								    "This argument ordering is deprecated!");
-				}
-			/* New-style timeout */
-			} else {
-				old_style = false;
-				timeout = tal(cmd, unsigned int);
-				if (!json_to_number(buffer, firsttok, timeout))
-					return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-							    "Expected unilerataltimeout to be a number");
-
-				if (secondtok) {
-					enum address_parse_result res;
-					res = json_to_address_scriptpubkey(cmd,
-									   chainparams,
-									   buffer, secondtok,
-									   &close_to_script);
-					if (res == ADDRESS_PARSE_UNRECOGNIZED)
-						return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-								    "Could not parse destination address");
-					else if (res == ADDRESS_PARSE_WRONG_NETWORK)
-						return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-								    "Destination address is not on network %s",
-								    chainparams->network_name);
-				}
-			}
-		} else if (secondtok) {
-			unsigned int *tmp_timeout = tal(tmpctx, unsigned int);
-
-			if (json_to_number(buffer, secondtok, tmp_timeout)) {
-				old_style = true;
-				timeout = tal_steal(cmd, tmp_timeout);
-			} else {
-				old_style = false;
-				enum address_parse_result res;
-
-				res = json_to_address_scriptpubkey(cmd,
-								   chainparams,
-								   buffer, secondtok,
-								   &close_to_script);
-				if (res == ADDRESS_PARSE_UNRECOGNIZED)
-					return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-							    "Could not parse destination address");
-				else if (res == ADDRESS_PARSE_WRONG_NETWORK)
-					return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
-							    "Destination address is not on network %s",
-							    chainparams->network_name);
-			}
-		} else
-			old_style = false;
-
-		/* If they didn't specify timeout, it's the (new) default */
-		if (!timeout) {
-			timeout = tal(cmd, unsigned int);
-			*timeout = 48 * 3600;
-		}
-		/* New style: do_timeout unless it's 0 */
-		if (!old_style)
 	do_timeout = (*timeout != 0);
-		else
-			do_timeout = true;
-	} else {
-		/* Named parameters are easy to distinguish */
-		if (!param(cmd, buffer, params,
-			   p_req("id", param_tok, &idtok),
-			   p_opt_def("unilateraltimeout", param_number,
-				     &timeout, 48 * 3600),
-			   p_opt("destination", param_bitcoin_address,
-				 &close_to_script),
-			   p_opt("force", param_bool, &old_force),
-			   p_opt("timeout", param_number, &old_timeout),
-			   NULL))
-			return command_param_failed();
-
-		/* Old style has lower priority. */
-		if (!close_to_script) {
-			/* Old style. */
-			if (old_timeout) {
-				*timeout = *old_timeout;
-			}
-			if (old_force) {
-				/* Use old default */
-				if (!old_timeout)
-					*timeout = 30;
-				force = *old_force;
-			}
-		}
-
-		/* New style: do_timeout unless it's 0 */
-		if (!old_timeout && !old_force)
-			do_timeout = (*timeout != 0);
-		else
-			do_timeout = true;
-	}
 
 	peer = peer_from_json(cmd->ld, buffer, idtok);
 	if (peer)

tests/test_closing.py

@@ -3,7 +3,7 @@ from flaky import flaky
 from pyln.client import RpcError
 from utils import (
     only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT, VALGRIND,
-    SLOW_MACHINE, COMPAT
+    SLOW_MACHINE
 )
 
 import os
@@ -360,39 +360,6 @@ def test_closing_specified_destination(node_factory, bitcoind, chainparams):
         assert 1 == bitcoind.rpc.gettxout(closetx, output_num1)['confirmations']
 
 
-@unittest.skipIf(not COMPAT, "needs COMPAT=1")
-def test_deprecated_closing_compat(node_factory, bitcoind, chainparams):
-    """ The old-style close command is:
-        close {id} {force} {timeout}
-    """
-    l1, l2 = node_factory.get_nodes(2, opts=[{'allow-deprecated-apis': True}, {}])
-    addr = chainparams['example_addr']
-    nodeid = l2.info['id']
-
-    l1.rpc.check(command_to_check='close', id=nodeid)
-    # New-style
-    l1.rpc.check(command_to_check='close', id=nodeid, unilateraltimeout=10, destination=addr)
-    l1.rpc.check(command_to_check='close', id=nodeid, unilateraltimeout=0)
-    l1.rpc.check(command_to_check='close', id=nodeid, destination=addr)
-    # Old-style
-    l1.rpc.check(command_to_check='close', id=nodeid, force=False)
-    l1.rpc.check(command_to_check='close', id=nodeid, force=False, timeout=10)
-    l1.rpc.check(command_to_check='close', id=nodeid, timeout=10)
-
-    l1.rpc.call('check', ['close', nodeid])
-    # Array(new-style)
-    l1.rpc.call('check', ['close', nodeid, 10])
-    l1.rpc.call('check', ['close', nodeid, 0, addr])
-    l1.rpc.call('check', ['close', nodeid, None, addr])
-    # Array(old-style)
-    l1.rpc.call('check', ['close', nodeid, True, 10])
-    l1.rpc.call('check', ['close', nodeid, False])
-    l1.rpc.call('check', ['close', nodeid, None, 10])
-    # Not new-style nor old-style
-    with pytest.raises(RpcError, match=r'Expected unilerataltimeout to be a number'):
-        l1.rpc.call('check', ['close', nodeid, "Given enough eyeballs, all bugs are shallow."])
-
-
 def closing_fee(node_factory, bitcoind, chainparams, opts):
     rate = opts['funder_feerate_per_kw']
     funder = node_factory.get_node(feerates=(rate, rate, rate))