Skip to content

Commit 1e023e5

Browse files
committed
merge bitcoin#25369: Unsubtree Univalue
1 parent 6b9e682 commit 1e023e5

33 files changed

+31
-1345
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ src/obj
4949
share/setup.nsi
5050
share/qt/Info.plist
5151

52-
src/univalue/gen
53-
5452
src/qt/*.moc
5553
src/qt/moc_*.cpp
5654
src/qt/forms/ui_*.h

Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ LCOV_FILTER_PATTERN = \
169169
-p "src/leveldb/" \
170170
-p "src/crc32c/" \
171171
-p "src/bench/" \
172-
-p "src/univalue" \
173172
-p "src/crypto/ctaes" \
174173
-p "src/minisketch" \
175174
-p "src/secp256k1" \

ci/lint/06_script.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export COMMIT_RANGE
2626
test/lint/git-subtree-check.sh src/crypto/ctaes
2727
test/lint/git-subtree-check.sh src/secp256k1
2828
test/lint/git-subtree-check.sh src/minisketch
29-
test/lint/git-subtree-check.sh src/univalue
3029
test/lint/git-subtree-check.sh src/leveldb
3130
test/lint/check-doc.py
3231
test/lint/all-lint.py

contrib/devtools/copyright_header.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"src/leveldb/",
4646
"src/minisketch",
4747
"src/secp256k1/",
48-
"src/univalue/",
4948
]
5049

5150
INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.mm', '*.py', '*.sh', '*.bash-completion']

doc/developer-notes.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,10 +1155,6 @@ Current subtrees include:
11551155
- src/crypto/ctaes
11561156
- Upstream at https://github.com/bitcoin-core/ctaes ; maintained by Core contributors.
11571157

1158-
- src/univalue
1159-
- Subtree at https://github.com/bitcoin-core/univalue-subtree ; maintained by Core contributors.
1160-
- Deviates from upstream https://github.com/jgarzik/univalue.
1161-
11621158
- src/minisketch
11631159
- Upstream at https://github.com/sipa/minisketch ; maintained by Core contributors.
11641160

src/univalue/.cirrus.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/univalue/COPYING

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/univalue/Makefile.am

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/univalue/README.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/univalue/autogen.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)