Remove --enable-experimental-features, use all runtime flags.

.github/scripts/build.sh

@@ -7,7 +7,6 @@ export CC=${COMPILER:-gcc}
 export COMPAT=${COMPAT:-1}
 export TEST_CHECK_DBSTMTS=${TEST_CHECK_DBSTMTS:-0}
 export DEVELOPER=${DEVELOPER:-1}
-export EXPERIMENTAL_FEATURES=${EXPERIMENTAL_FEATURES:-0}
 export PATH=$CWD/dependencies/bin:"$HOME"/.local/bin:"$PATH"
 export PYTEST_OPTS="--maxfail=5 --suppress-no-test-exit-code ${PYTEST_OPTS}"
 export PYTEST_PAR=${PYTEST_PAR:-10}

.github/workflows/bsd.yml

@@ -14,15 +14,14 @@ jobs:
     env:
       DEVELOPER: 1
       VALGRIND: 0
-      EXPERIMENTAL_FEATURES: 0
       COMPAT: 1
     steps:
     - uses: actions/checkout@v2
     - name: Test in FreeBSD
       id: test
       uses: vmactions/[email protected]
       with:
-        envs: 'DEVELOPER VALGRIND EXPERIMENTAL_FEATURES COMPAT'
+        envs: 'DEVELOPER VALGRIND COMPAT'
         usesh: true
         prepare: |
           pkg install -y \

.github/workflows/ci.yaml

@@ -97,7 +97,6 @@ jobs:
     env:
       COMPAT: 1
       DEVELOPER: 1
-      EXPERIMENTAL_FEATURES: 1
       ASAN: 1
       UBSAN: 1
       VALGRIND: 0
@@ -137,26 +136,15 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - CFG: gcc-dev1-exp1
+          - CFG: gcc-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
             COMPILER: gcc
-          - CFG: gcc-dev1-exp0
-            DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 0
-            COMPILER: gcc
-          - CFG: gcc-dev0-exp1
-            DEVELOPER: 0
-            EXPERIMENTAL_FEATURES: 1
-            COMPILER: gcc
-          - CFG: gcc-dev0-exp0
+          - CFG: gcc-dev0
             DEVELOPER: 0
-            EXPERIMENTAL_FEATURES: 0
             COMPILER: gcc
           # While we're at it let's try to compile with clang
-          - CFG: clang-dev1-exp1
+          - CFG: clang-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
             COMPILER: clang
     steps:
       - name: Checkout
@@ -175,7 +163,6 @@ jobs:
         env:
           VALGRIND: ${{ matrix.VALGRIND }}
           DEVELOPER: ${{ matrix.DEVELOPER }}
-          EXPERIMENTAL_FEATURES: ${{ matrix.EXPERIMENTAL_FEATURES }}
           COMPILER: ${{ matrix.COMPILER }}
           COMPAT: 1
           CFG: ${{ matrix.CFG }}
@@ -213,56 +200,37 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - NAME: gcc-dev1-exp1
-            CFG: gcc-dev1-exp1
-            DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
-            TEST_DB_PROVIDER: sqlite3
-            COMPILER: gcc
-            TEST_NETWORK: regtest
-          - NAME:  gcc-dev1-exp0
-            CFG: gcc-dev1-exp0
+          - NAME:  gcc-dev1
+            CFG: gcc-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 0
-            TEST_DB_PROVIDER: sqlite3
-            COMPILER: gcc
-            TEST_NETWORK: regtest
-          - NAME: gcc-dev0-exp1
-            CFG: gcc-dev0-exp1
-            DEVELOPER: 0
-            EXPERIMENTAL_FEATURES: 1
             TEST_DB_PROVIDER: sqlite3
             COMPILER: gcc
             TEST_NETWORK: regtest
-          - NAME: gcc-dev0-exp0
-            CFG: gcc-dev0-exp0
+          - NAME: gcc-dev0
+            CFG: gcc-dev0
             DEVELOPER: 0
-            EXPERIMENTAL_FEATURES: 0
             TEST_DB_PROVIDER: sqlite3
             COMPILER: gcc
             TEST_NETWORK: regtest
           # While we're at it let's try to compile with clang
-          - NAME: clang-dev1-exp1
-            CFG: clang-dev1-exp1
+          - NAME: clang-dev1
+            CFG: clang-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
             TEST_DB_PROVIDER: sqlite3
             COMPILER: clang
             TEST_NETWORK: regtest
           # And of course we want to test postgres too
           - NAME: postgres
-            CFG: gcc-dev1-exp1
+            CFG: gcc-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
             COMPILER: gcc
             TEST_DB_PROVIDER: postgres
             TEST_NETWORK: regtest
           # And don't forget about elements (like cdecker did when
           # reworking the CI...)
           - NAME: liquid
-            CFG: gcc-dev1-exp1
+            CFG: gcc-dev1
             DEVELOPER: 1
-            EXPERIMENTAL_FEATURES: 1
             COMPILER: gcc
             TEST_NETWORK: liquid-regtest
             TEST_DB_PROVIDER: sqlite3
@@ -292,7 +260,6 @@ jobs:
         env:
           VALGRIND: ${{ matrix.VALGRIND }}
           DEVELOPER: ${{ matrix.DEVELOPER }}
-          EXPERIMENTAL_FEATURES: ${{ matrix.EXPERIMENTAL_FEATURES }}
           COMPILER: ${{ matrix.COMPILER }}
           COMPAT: 1
           CFG: ${{ matrix.CFG }}
@@ -315,9 +282,8 @@ jobs:
       ELEMENTS_VERSION: 22.0.2
       RUST_PROFILE: release  # Has to match the one in the compile step
       VALGRIND: 1
-      CFG: gcc-dev1-exp1
+      CFG: gcc-dev1
       DEVELOPER: 1
-      EXPERIMENTAL_FEATURES: 1
       PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800
     needs:
       - compile
@@ -366,10 +332,10 @@ jobs:
       - name: Download build
         uses: actions/download-artifact@v3
         with:
-          name: cln-gcc-dev1-exp1.tar.bz2
+          name: cln-gcc-dev1.tar.bz2
 
       - name: Unpack build
-        run: tar -xvjf cln-gcc-dev1-exp1.tar.bz2
+        run: tar -xvjf cln-gcc-dev1.tar.bz2
 
       - name: Test
         env:

.github/workflows/macos.yaml

@@ -10,7 +10,6 @@ jobs:
     env:
       DEVELOPER: 1
       VALGRIND: 0
-      EXPERIMENTAL_FEATURES: 1
       COMPAT: 0
     strategy:
       fail-fast: true
@@ -42,7 +41,6 @@ jobs:
         env:
           VALGRIND: ${{ matrix.VALGRIND }}
           DEVELOPER: ${{ matrix.DEVELOPER }}
-          EXPERIMENTAL_FEATURES: ${{ matrix.EXPERIMENTAL_FEATURES }}
           COMPILER: ${{ matrix.COMPILER }}
           COMPAT: ${{ matrix.COMPAT }}
           PYTEST_PAR: ${{ matrix.PYTEST_PAR }}

.github/workflows/prototest.yaml

@@ -29,7 +29,6 @@ jobs:
           -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
           -e VALGRIND=${{ matrix.valgrind }} \
           -e DEVELOPER=1 \
-          -e EXPERIMENTAL_FEATURES=1 \
           -e COMPAT=0 \
           -e PYTEST_PAR=2 \
           -e PYTEST_OPTS="--timeout=300" \

Makefile

@@ -291,14 +291,6 @@ config.vars:
 %.o: %.c
 	@$(call VERBOSE, "cc $<", $(CC) $(CFLAGS) -c -o $@ $<)
 
-# '_exp' inserted before _wiregen.[ch] to demark experimental
-# spec-derived headers, which are *not* committed into git.
-ifeq ($(EXPERIMENTAL_FEATURES),1)
-EXP := _exp
-else
-EXP :=
-endif
-
 # tools/update-mocks.sh does nasty recursive make, must not do this!
 ifeq ($(SUPPRESS_GENERATION),1)
 SHA256STAMP_CHANGED = false
@@ -727,11 +719,11 @@ pyln-release-%:
 	cd contrib/pyln-$* && $(MAKE) prod-release
 
 # These must both be enabled for update-mocks
-ifeq ($(DEVELOPER)$(EXPERIMENTAL_FEATURES),11)
+ifeq ($(DEVELOPER),1)
 update-mocks: $(ALL_TEST_PROGRAMS:%=update-mocks/%.c)
 else
 update-mocks:
-	@echo Need DEVELOPER=1 and EXPERIMENTAL_FEATURES=1 to regenerate mocks >&2; exit 1
+	@echo Need DEVELOPER=1 to regenerate mocks >&2; exit 1
 endif
 
 $(ALL_TEST_PROGRAMS:%=update-mocks/%.c): $(ALL_GEN_HEADERS) $(EXTERNAL_LIBS) libccan.a ccan/ccan/cdump/tools/cdump-enumstr config.vars