From 8894455c02859cf8079edca1fa01862bb50f6bf5 Mon Sep 17 00:00:00 2001 From: Peter Neuroth Date: Mon, 22 Apr 2024 17:49:07 +0200 Subject: [PATCH] ci: Update elementsd version used for tests Using `getblockfrompeer` requires a version equal or above 23.0.0 Signed-off-by: Peter Neuroth --- .github/workflows/ci.yaml | 6 +++--- plugins/bcli.c | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 60baf418c..1493e0ef2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -212,7 +212,7 @@ jobs: timeout-minutes: 120 env: BITCOIN_VERSION: "26.1" - ELEMENTS_VERSION: 22.0.2 + ELEMENTS_VERSION: 23.2.1 RUST_PROFILE: release # Has to match the one in the compile step PYTEST_OPTS: --timeout=1200 --force-flaky needs: @@ -320,7 +320,7 @@ jobs: timeout-minutes: 120 env: BITCOIN_VERSION: "26.1" - ELEMENTS_VERSION: 22.0.2 + ELEMENTS_VERSION: 23.2.1 RUST_PROFILE: release # Has to match the one in the compile step CFG: compile-gcc PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --force-flaky @@ -390,7 +390,7 @@ jobs: timeout-minutes: 120 env: BITCOIN_VERSION: "26.1" - ELEMENTS_VERSION: 22.0.2 + ELEMENTS_VERSION: 23.2.1 RUST_PROFILE: release SLOW_MACHINE: 1 TEST_DEBUG: 1 diff --git a/plugins/bcli.c b/plugins/bcli.c index 41f08feec..be2c4c3f5 100644 --- a/plugins/bcli.c +++ b/plugins/bcli.c @@ -1004,17 +1004,7 @@ static struct command_result *sendrawtransaction(struct command *cmd, return command_param_failed(); if (*allowhighfees) { - if (bitcoind->version >= 190001) - /* Starting in 19.0.1, second argument is - * maxfeerate, which when set to 0 means - * no max feerate. - */ highfeesarg = "0"; - else - /* in older versions, second arg is allowhighfees, - * set to true to allow high fees. - */ - highfeesarg = "true"; } else highfeesarg = NULL;