@@ -343,7 +343,6 @@ fn shutdown_on_unfunded_channel() {
343
343
let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
344
344
let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
345
345
let nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
346
- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
347
346
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
348
347
349
348
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() {
375
374
let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
376
375
let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
377
376
let nodes = create_network ( 2 , & node_cfgs, & node_chanmgrs) ;
378
- let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
379
377
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
380
378
381
379
let chan_id =
@@ -1243,7 +1241,6 @@ fn test_segwit_v0_shutdown_script() {
1243
1241
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1244
1242
let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1245
1243
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1246
- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
1247
1244
1248
1245
let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
1249
1246
nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1283,7 +1280,6 @@ fn test_anysegwit_shutdown_script() {
1283
1280
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1284
1281
let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1285
1282
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1286
- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
1287
1283
1288
1284
let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
1289
1285
nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1327,7 +1323,6 @@ fn test_unsupported_anysegwit_shutdown_script() {
1327
1323
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1328
1324
let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1329
1325
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1330
- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
1331
1326
1332
1327
// Check that using an unsupported shutdown script fails and a supported one succeeds.
1333
1328
let supported_shutdown_script =
@@ -1375,7 +1370,6 @@ fn test_invalid_shutdown_script() {
1375
1370
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1376
1371
let node_a_id = nodes[ 0 ] . node . get_our_node_id ( ) ;
1377
1372
let node_b_id = nodes[ 1 ] . node . get_our_node_id ( ) ;
1378
- let node_c_id = nodes[ 2 ] . node . get_our_node_id ( ) ;
1379
1373
1380
1374
let chan = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) ;
1381
1375
nodes[ 1 ] . node . close_channel ( & chan. 2 , & node_a_id) . unwrap ( ) ;
@@ -1404,8 +1398,6 @@ fn test_user_shutdown_script() {
1404
1398
let node_chanmgrs = create_node_chanmgrs ( 3 , & node_cfgs, & user_cfgs) ;
1405
1399
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1406
1400
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 ( ) ;
1409
1401
1410
1402
// Segwit v0 script of the form OP_0 <20-byte hash>
1411
1403
let script = Builder :: new ( ) . push_int ( 0 ) . push_slice ( & [ 0 ; 20 ] ) . into_script ( ) ;
@@ -1435,8 +1427,6 @@ fn test_already_set_user_shutdown_script() {
1435
1427
let node_chanmgrs = create_node_chanmgrs ( 3 , & node_cfgs, & user_cfgs) ;
1436
1428
let nodes = create_network ( 3 , & node_cfgs, & node_chanmgrs) ;
1437
1429
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 ( ) ;
1440
1430
1441
1431
// Segwit v0 script of the form OP_0 <20-byte hash>
1442
1432
let script = Builder :: new ( ) . push_int ( 0 ) . push_slice ( & [ 0 ; 20 ] ) . into_script ( ) ;
@@ -1878,10 +1868,6 @@ fn batch_funding_failure() {
1878
1868
let node_cfgs = create_node_cfgs ( 4 , & chanmon_cfgs) ;
1879
1869
let node_chanmgrs = create_node_chanmgrs ( 4 , & node_cfgs, & [ None , None , None , None ] ) ;
1880
1870
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 ( ) ;
1885
1871
1886
1872
let temp_chan_id_a = exchange_open_accept_chan ( & nodes[ 0 ] , & nodes[ 1 ] , 1_000_000 , 0 ) ;
1887
1873
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() {
2004
1990
let node_cfgs = create_node_cfgs ( 2 , & chanmon_cfgs) ;
2005
1991
let node_chanmgrs = create_node_chanmgrs ( 2 , & node_cfgs, & [ None , None ] ) ;
2006
1992
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 ( ) ;
2009
1993
2010
1994
let chan_id = create_announced_chan_between_nodes ( & nodes, 0 , 1 ) . 2 ;
2011
1995
0 commit comments