Skip to content

Commit 6d11830

Browse files
committed
verifybinaries: remove awkward bitcoin-core prefix handling
1 parent c44323a commit 6d11830

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

contrib/verifybinaries/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ Validate releases with default settings:
4444
```sh
4545
./contrib/verifybinaries/verify.py pub 22.0
4646
./contrib/verifybinaries/verify.py pub 22.0-rc2
47-
./contrib/verifybinaries/verify.py pub bitcoin-core-23.0
48-
./contrib/verifybinaries/verify.py pub bitcoin-core-23.0-rc1
4947
```
5048

5149
Get JSON output and don't prompt for user input (no auto key import):
@@ -66,12 +64,12 @@ specified keys, while requiring a threshold of at least 10 trusted signatures:
6664
If you only want to download the binaries of certain platform, add the corresponding suffix, e.g.:
6765

6866
```sh
69-
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-osx
70-
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-rc2-win64
67+
./contrib/verifybinaries/verify.py pub 22.0-osx
68+
./contrib/verifybinaries/verify.py pub 22.0-rc2-win64
7169
```
7270

7371
If you do not want to keep the downloaded binaries, specify anything as the second parameter.
7472

7573
```sh
76-
./contrib/verifybinaries/verify.py pub bitcoin-core-22.0 delete
74+
./contrib/verifybinaries/verify.py pub 22.0 delete
7775
```

contrib/verifybinaries/verify.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ def bool_from_env(key, default=False) -> bool:
9999
VERSION_EXAMPLE = "22.0-x86_64 or 0.21.0-rc2-osx"
100100

101101
def parse_version_string(version_str):
102-
if version_str.startswith(VERSIONPREFIX): # remove version prefix
103-
version_str = version_str[len(VERSIONPREFIX):]
104-
105102
parts = version_str.split('-')
106103
version_base = parts[0]
107104
version_rc = ""
@@ -290,8 +287,8 @@ def join_url(host: str) -> str:
290287
log.error(
291288
f"couldn't fetch file ({url}). "
292289
"Have you specified the version number in the following format?\n"
293-
f"[{VERSIONPREFIX}]{VERSION_FORMAT} "
294-
f"(example: {VERSIONPREFIX}{VERSION_EXAMPLE})\n"
290+
f"{VERSION_FORMAT} "
291+
f"(example: {VERSION_EXAMPLE})\n"
295292
f"wget output:\n{indent(output)}")
296293
return ReturnCode.FILE_GET_FAILED
297294
else:

0 commit comments

Comments
 (0)