@@ -343,7 +343,6 @@ fn shutdown_on_unfunded_channel() {
343343 let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
344344 let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
345345 let nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
346- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
347346 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
348347
349348 nodes[ 0 ] . node . create_channel ( node_b_id, 1_000_000 , 100_000 , 0 , None , None ) . unwrap ( ) ;
@@ -375,7 +374,6 @@ fn close_on_unfunded_channel() {
375374 let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
376375 let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
377376 let nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
378- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
379377 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
380378
381379 let chan_id =
@@ -1243,7 +1241,6 @@ fn test_segwit_v0_shutdown_script() {
12431241 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
12441242 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
12451243 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1246- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
12471244
12481245 let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
12491246 nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1283,7 +1280,6 @@ fn test_anysegwit_shutdown_script() {
12831280 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
12841281 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
12851282 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1286- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
12871283
12881284 let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
12891285 nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1327,7 +1323,6 @@ fn test_unsupported_anysegwit_shutdown_script() {
13271323 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
13281324 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
13291325 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1330- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
13311326
13321327 // Check that using an unsupported shutdown script fails and a supported one succeeds.
13331328 let supported_shutdown_script =
@@ -1375,7 +1370,6 @@ fn test_invalid_shutdown_script() {
13751370 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
13761371 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
13771372 let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1378- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
13791373
13801374 let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
13811375 nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1404,8 +1398,6 @@ fn test_user_shutdown_script() {
14041398 let node_chanmgrs = create_node_chanmgrs ( 3 , & node_cfgs, & user_cfgs) ;
14051399 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
14061400 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1407- let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1408- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
14091401
14101402 // Segwit v0 script of the form OP_0 <20-byte hash>
14111403 let script = Builder :: new ( ) . push_int ( 0 ) . push_slice ( & [ 0 ; 20 ] ) . into_script ( ) ;
@@ -1435,8 +1427,6 @@ fn test_already_set_user_shutdown_script() {
14351427 let node_chanmgrs = create_node_chanmgrs ( 3 , & node_cfgs, & user_cfgs) ;
14361428 let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
14371429 let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1438- let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1439- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
14401430
14411431 // Segwit v0 script of the form OP_0 <20-byte hash>
14421432 let script = Builder :: new ( ) . push_int ( 0 ) . push_slice ( & [ 0 ; 20 ] ) . into_script ( ) ;
@@ -1878,10 +1868,6 @@ fn batch_funding_failure() {
18781868 let node_cfgs = create_node_cfgs ( 4 , & chanmon_cfgs) ;
18791869 let node_chanmgrs = create_node_chanmgrs ( 4 , & node_cfgs, & [ None , None , None , None ] ) ;
18801870 let nodes = create_network ( 4 , & node_cfgs, & node_chanmgrs) ;
1881- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1882- let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1883- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
1884- let node_d_id = nodes[ 3 ] . node . get_our_node_id ( ) ;
18851871
18861872 let temp_chan_id_a = exchange_open_accept_chan ( & nodes[ 0 ] , & nodes[ 1 ] , 1_000_000 , 0 ) ;
18871873 let temp_chan_id_b = exchange_open_accept_chan ( & nodes[ 0 ] , & nodes[ 2 ] , 1_000_000 , 0 ) ;
@@ -2004,8 +1990,6 @@ fn test_force_closure_on_low_stale_fee() {
20041990 let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
20051991 let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
20061992 let nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
2007- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
2008- let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
20091993
20101994 let chan_id = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) . 2 ;
20111995
0 commit comments