fixup! channeld: Code to implement splicing

Update rebase conflicts

Author: ddustin

common/hsm_version.h

@@ -15,7 +15,7 @@
  * v4 with sign_any_penalty_to_us: ead7963185194a515d1f14d2c44401392575299d68ce9a13d8a12baff3cf4f35
  * v4 with sign_anchorspend: 8a30722e38b56e82af566b9629ff18da01fcebd1e80ec67f04d8b3a2fa66d81c
  * v4 with sign_htlc_tx_mingle: b9247e75d41ee1b3fc2f7db0bac8f4e92d544ab2f017d430ae3a000589c384e5
- * v4 with splicing: ffac29e213c0316b9b892b03d7d02f5734482a2b4422051ebdfc6b41265f274b
+ * v4 with splicing: 06f21012936f825913af289fa81af1512c9ada1cb97c611698975a8fd287edbb
  */
 #define HSM_MIN_VERSION 3
 #define HSM_MAX_VERSION 4

wire/wire.h

@@ -72,12 +72,4 @@ u8 *fromwire_tal_arrn(const tal_t *ctx,
 char *fromwire_wirestring(const tal_t *ctx, const u8 **cursor, size_t *max);
 void fromwire_siphash_seed(const u8 **cursor, size_t *max,
 			   struct siphash_seed *seed);
-
-
-/* Stubs, as this subtype is only defined when EXPERIMENTAL_FEATURES */
-struct onionmsg_path;
-
-void towire_onionmsg_path(u8 **p, const struct onionmsg_path *onionmsg_path);
-struct onionmsg_path *
-fromwire_onionmsg_path(const tal_t *ctx, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_WIRE_H */