events: rename 'localfeatures' to 'features'

as per 206084c

Author: darosior

tests/events/bolt1-01-init.events

@@ -6,7 +6,7 @@ EXPECT_INIT=expect-send: type=init
 
 1. connect: privkey=0000000000000000000000000000000000000000000000000000000000000003
 2. $EXPECT_INIT
-3. recv: type=init globalfeatures= localfeatures=
+3. recv: type=init globalfeatures= features=
 
     1. nothing
     1. disconnect:
@@ -18,61 +18,61 @@ EXPECT_INIT=expect-send: type=init
     # Minimal possible init message.
     # Spec: MUST send `init` as the first Lightning message for any connection.
     1. $EXPECT_INIT
-    2. recv: type=init globalfeatures= localfeatures=
+    2. recv: type=init globalfeatures= features=
 
     # SHOULD NOT set features greater than 13 in `globalfeatures`.
     1. $EXPECT_INIT globalfeatures=000000/030000
     # init msg with unknown odd global bit (19): no error
-    2. recv: type=init globalfeatures=020000 localfeatures=
+    2. recv: type=init globalfeatures=020000 features=
 
     # Sanity check that bits 34 and 35 are not used!
-    1. $EXPECT_INIT localfeatures=0000000000/0300000000
+    1. $EXPECT_INIT features=0000000000/0300000000
     # init msg with unknown odd local bit (19): no error
-    2. recv: type=init globalfeatures= localfeatures=020000
+    2. recv: type=init globalfeatures= features=020000
 
     # init msg with unknown even global bit (34): you will error
     1. $EXPECT_INIT
-    2. recv: type=init globalfeatures=0100000000 localfeatures=
+    2. recv: type=init globalfeatures=0100000000 features=
     3. expect-error:
 
     # init msg with unknown even local bit (34): you will error
     1. $EXPECT_INIT
-    2. recv: type=init globalfeatures= localfeatures=0100000000
+    2. recv: type=init globalfeatures= features=0100000000
     3. expect-error:
 
     # If you don't support `option_data_loss_protect`, you will be ok if
     # we ask for it.
-    1. $EXPECT_INIT localfeatures=00/03 !option_data_loss_protect
-    2. recv: type=init globalfeatures= localfeatures=02 !option_data_loss_protect
+    1. $EXPECT_INIT features=00/03 !option_data_loss_protect
+    2. recv: type=init globalfeatures= features=02 !option_data_loss_protect
 
     # If you don't support `option_data_loss_protect`, you will error if
     # we require it.
-    1. $EXPECT_INIT localfeatures=00/03 !option_data_loss_protect
-    2. recv: type=init globalfeatures= localfeatures=01 !option_data_loss_protect
+    1. $EXPECT_INIT features=00/03 !option_data_loss_protect
+    2. recv: type=init globalfeatures= features=01 !option_data_loss_protect
     3. expect-error: !option_data_loss_protect
 
     # If you support `option_data_loss_protect`, you will advertize it odd.
-    1. $EXPECT_INIT localfeatures=02/03 option_data_loss_protect/odd
+    1. $EXPECT_INIT features=02/03 option_data_loss_protect/odd
 
     # If you require `option_data_loss_protect`, you will advertize it even.
-    1. $EXPECT_INIT localfeatures=01/03 option_data_loss_protect/even
+    1. $EXPECT_INIT features=01/03 option_data_loss_protect/even
 
     # If you don't support `option_static_remotekey`, you will be ok if
     # we ask for it.
-    1. $EXPECT_INIT localfeatures=0000/3000 !option_static_remotekey
-    2. recv: type=init globalfeatures= localfeatures=2000 !option_static_remotekey
+    1. $EXPECT_INIT features=0000/3000 !option_static_remotekey
+    2. recv: type=init globalfeatures= features=2000 !option_static_remotekey
 
     # If you don't support `option_static_remotekey`, you will error if
     # we require it.
-    1. $EXPECT_INIT localfeatures=0000/3000 !option_static_remotekey
-    2. recv: type=init globalfeatures= localfeatures=1000 !option_static_remotekey
+    1. $EXPECT_INIT features=0000/3000 !option_static_remotekey
+    2. recv: type=init globalfeatures= features=1000 !option_static_remotekey
     3. expect-error: !option_static_remotekey
 
     # If you support `option_static_remotekey`, you will advertize it odd.
-    1. $EXPECT_INIT localfeatures=2000/3000 option_static_remotekey/odd
+    1. $EXPECT_INIT features=2000/3000 option_static_remotekey/odd
 
     # If you require `option_static_remotekey`, you will advertize it even.
-    1. $EXPECT_INIT localfeatures=1000/3000 option_static_remotekey/even
+    1. $EXPECT_INIT features=1000/3000 option_static_remotekey/even
 
     # Note: it's undefined what you'll do if implementation requires
     # an option and isn't offered it.  The recipient of the required feature

tests/events/bolt1-02-unknown-messages.events

@@ -10,7 +10,7 @@
 
 1. connect: privkey=0000000000000000000000000000000000000000000000000000000000000003
 2. expect-send: type=init
-3. recv: type=init globalfeatures= localfeatures=
+3. recv: type=init globalfeatures= features=
 
     1. nothing
 

tests/events/bolt2-01-open_channel.events

@@ -6,7 +6,7 @@ include setup.incl
 
 2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
 3. expect-send: type=init
-4. recv: type=init globalfeatures= localfeatures=
+4. recv: type=init globalfeatures= features=
 
     # Start with the 'accepter' side of an open_channel (test runner initiates)
     # We assume a funding_per_kw=253 Satoshi/kSipa.

tests/events/bolt2-02-add-htlc.events

@@ -18,7 +18,7 @@ include setup.incl
 
 2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
 3. expect-send: type=init
-4. recv: type=init globalfeatures= localfeatures=2002
+4. recv: type=init globalfeatures= features=2002
 5. recv: type=open_channel
    chain_hash=06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f
    temporary_channel_id=0000000000000000000000000000000000000000000000000000000000000000
@@ -106,7 +106,7 @@ include setup.incl
     3. expect-send: type=init
     # Note: if we opened channel with option_static_remotekey, it stands even
     # if we don't negotiate it again!
-    4. recv: type=init globalfeatures= localfeatures=2002
+    4. recv: type=init globalfeatures= features=2002
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=1
@@ -158,7 +158,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=1
@@ -216,7 +216,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -249,7 +249,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -276,7 +276,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -311,7 +311,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -350,7 +350,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=1
@@ -425,7 +425,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -458,7 +458,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -485,7 +485,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -520,7 +520,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=2002
+        4. recv: type=init globalfeatures= features=2002
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2

tests/events/bolt2-03-htlc-fail.events

@@ -18,7 +18,7 @@ include setup.incl
 
 2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
 3. expect-send: type=init
-4. recv: type=init globalfeatures= localfeatures=2002
+4. recv: type=init globalfeatures= features=2002
 5. recv: type=open_channel
    chain_hash=06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f
    temporary_channel_id=0000000000000000000000000000000000000000000000000000000000000000
@@ -136,7 +136,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=02
+        4. recv: type=init globalfeatures= features=02
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -197,7 +197,7 @@ include setup.incl
         1. disconnect:
         2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
         3. expect-send: type=init
-        4. recv: type=init globalfeatures= localfeatures=02
+        4. recv: type=init globalfeatures= features=02
         5. expect-send: type=channel_reestablish
            channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
            next_commitment_number=2
@@ -231,7 +231,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -269,7 +269,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -300,7 +300,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -335,7 +335,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -376,7 +376,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=3
@@ -399,7 +399,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=3

tests/events/bolt2-04-htlc-fulfill.events

@@ -22,7 +22,7 @@ include setup.incl
 
 4. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
 5. expect-send: type=init
-6. recv: type=init globalfeatures= localfeatures=2002
+6. recv: type=init globalfeatures= features=2002
 7. recv: type=open_channel
    chain_hash=06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f
    temporary_channel_id=0000000000000000000000000000000000000000000000000000000000000000
@@ -160,7 +160,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -252,7 +252,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -301,7 +301,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=2
@@ -376,7 +376,7 @@ include setup.incl
     1. disconnect:
     2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000002
     3. expect-send: type=init
-    4. recv: type=init globalfeatures= localfeatures=02
+    4. recv: type=init globalfeatures= features=02
     5. expect-send: type=channel_reestablish
        channel_id=2f0b21d6bd32971ca6803de2bdc7370bbf12e0cd9ce73afc1c591f5c995b0841
        next_commitment_number=3

tests/events/bolt7-01-channel_announcement-success.events

@@ -6,7 +6,7 @@ include setup.incl
 
 2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000003
 3. expect-send: type=init
-4. recv: type=init localfeatures= globalfeatures=
+4. recv: type=init features= globalfeatures=
 
 # Funding tx spending 16835ac8c154b616baac524163f41fb0c4f82c7b972ad35d4d6f18d854f6856b/1, feerate 253 to bitcoin privkeys 0000000000000000000000000000000000000000000000000000000000000010 and 0000000000000000000000000000000000000000000000000000000000000020
 # txid 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d
@@ -28,7 +28,7 @@ include setup.incl
 # New peer connects, asking for initial_routing_sync.  We *won't* relay channel_announcement, as there is no channel_update.
 7. connect: privkey=0000000000000000000000000000000000000000000000000000000000000005
 8. expect-send: type=init
-9. recv: type=init localfeatures=08 globalfeatures=
+9. recv: type=init features=08 globalfeatures=
 10. must-not-send: type=channel_announcement
 11. disconnect:
 
@@ -47,7 +47,7 @@ include setup.incl
 # Now we'll relay to a new peer.
 13. connect: privkey=0000000000000000000000000000000000000000000000000000000000000005
 14. expect-send: type=init
-15. recv: type=init localfeatures=08 globalfeatures=
+15. recv: type=init features=08 globalfeatures=
 16. expect-send: type=channel_announcement
    node_signature_1=SIG(0000000000000000000000000000000000000000000000000000000000000002:4ad0946fa8c3996015dec325c4b0540299287427ec8d8313842ce6f8dc06791a)
    node_signature_2=SIG(0000000000000000000000000000000000000000000000000000000000000003:4ad0946fa8c3996015dec325c4b0540299287427ec8d8313842ce6f8dc06791a)
@@ -105,6 +105,6 @@ include setup.incl
 
 22. connect: privkey=0000000000000000000000000000000000000000000000000000000000000005
 23. expect-send: type=init
-24. recv: type=init localfeatures=08 globalfeatures=
+24. recv: type=init features=08 globalfeatures=
 25. must-not-send: type=channel_announcement
 26. must-not-send: type=channel_update

tests/events/bolt7-02-channel_announcement-failures.events

@@ -5,7 +5,7 @@ include setup.incl
 
 2. connect: privkey=0000000000000000000000000000000000000000000000000000000000000003
 3. expect-send: type=init
-4. recv: type=init localfeatures= globalfeatures=
+4. recv: type=init features= globalfeatures=
 
 # Funding tx spending 16835ac8c154b616baac524163f41fb0c4f82c7b972ad35d4d6f18d854f6856b/1, feerate 253 to bitcoin privkeys 0000000000000000000000000000000000000000000000000000000000000010 and 0000000000000000000000000000000000000000000000000000000000000020
 # txid 189c40b0728f382fe91c87270926584e48e0af3a6789f37454afee6c7560311d
@@ -202,6 +202,6 @@ include setup.incl
 # New peer connects, asking for initial_routing_sync.  We *won't* relay channel_announcement.
 10. connect: privkey=0000000000000000000000000000000000000000000000000000000000000005
 11. expect-send: type=init
-12. recv: type=init localfeatures=08 globalfeatures=
+12. recv: type=init features=08 globalfeatures=
 13. must-not-send: type=channel_announcement
 14. must-not-send: type=channel_update