Skip to content

Commit 4510b76

Browse files
evoskuilevoskuil
committed
Rename golomb_coded (golomb) and neutrino_filter (neutrino), stub filters.
1 parent 5dcbd69 commit 4510b76

21 files changed

Lines changed: 342 additions & 83 deletions

File tree

‎Makefile.am‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ src_libbitcoin_system_la_SOURCES = \
8686
src/error/op_error_t.cpp \
8787
src/error/script_error_t.cpp \
8888
src/error/transaction_error_t.cpp \
89-
src/filter/golomb_coding.cpp \
89+
src/filter/golomb.cpp \
9090
src/hash/accumulator.cpp \
9191
src/hash/checksum.cpp \
9292
src/hash/siphash.cpp \
@@ -114,7 +114,7 @@ src_libbitcoin_system_la_SOURCES = \
114114
src/unicode/utf8_everywhere/unicode_streambuf.cpp \
115115
src/wallet/context.cpp \
116116
src/wallet/message.cpp \
117-
src/wallet/neutrino_filter.cpp \
117+
src/wallet/neutrino.cpp \
118118
src/wallet/point_value.cpp \
119119
src/wallet/points_value.cpp \
120120
src/wallet/addresses/bitcoin_uri.cpp \
@@ -275,6 +275,9 @@ test_libbitcoin_system_test_SOURCES = \
275275
test/error/op_error_t.cpp \
276276
test/error/script_error_t.cpp \
277277
test/error/transaction_error_t.cpp \
278+
test/filter/bloom.cpp \
279+
test/filter/golomb.cpp \
280+
test/filter/sieve.cpp \
278281
test/hash/accumulator.cpp \
279282
test/hash/checksum.cpp \
280283
test/hash/functions.cpp \
@@ -366,7 +369,7 @@ test_libbitcoin_system_test_SOURCES = \
366369
test/utreexo/utreexo.hpp \
367370
test/wallet/context.cpp \
368371
test/wallet/message.cpp \
369-
test/wallet/neutrino_filter.cpp \
372+
test/wallet/neutrino.cpp \
370373
test/wallet/point_value.cpp \
371374
test/wallet/points_value.cpp \
372375
test/wallet/addresses/bitcoin_uri.cpp \
@@ -543,8 +546,10 @@ include_bitcoin_system_error_HEADERS = \
543546

544547
include_bitcoin_system_filterdir = ${includedir}/bitcoin/system/filter
545548
include_bitcoin_system_filter_HEADERS = \
549+
include/bitcoin/system/filter/bloom.hpp \
546550
include/bitcoin/system/filter/filter.hpp \
547-
include/bitcoin/system/filter/golomb_coding.hpp
551+
include/bitcoin/system/filter/golomb.hpp \
552+
include/bitcoin/system/filter/sieve.hpp
548553

549554
include_bitcoin_system_hashdir = ${includedir}/bitcoin/system/hash
550555
include_bitcoin_system_hash_HEADERS = \
@@ -604,6 +609,11 @@ include_bitcoin_system_impl_endian_HEADERS = \
604609
include/bitcoin/system/impl/endian/uintx_t.ipp \
605610
include/bitcoin/system/impl/endian/unsafe.ipp
606611

612+
include_bitcoin_system_impl_filterdir = ${includedir}/bitcoin/system/impl/filter
613+
include_bitcoin_system_impl_filter_HEADERS = \
614+
include/bitcoin/system/impl/filter/bloom.ipp \
615+
include/bitcoin/system/impl/filter/sieve.ipp
616+
607617
include_bitcoin_system_impl_hashdir = ${includedir}/bitcoin/system/impl/hash
608618
include_bitcoin_system_impl_hash_HEADERS = \
609619
include/bitcoin/system/impl/hash/accumulator.ipp \
@@ -832,7 +842,7 @@ include_bitcoin_system_walletdir = ${includedir}/bitcoin/system/wallet
832842
include_bitcoin_system_wallet_HEADERS = \
833843
include/bitcoin/system/wallet/context.hpp \
834844
include/bitcoin/system/wallet/message.hpp \
835-
include/bitcoin/system/wallet/neutrino_filter.hpp \
845+
include/bitcoin/system/wallet/neutrino.hpp \
836846
include/bitcoin/system/wallet/point_value.hpp \
837847
include/bitcoin/system/wallet/points_value.hpp \
838848
include/bitcoin/system/wallet/wallet.hpp

‎builds/cmake/CMakeLists.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ add_library( ${CANONICAL_LIB_NAME}
527527
"../../src/error/op_error_t.cpp"
528528
"../../src/error/script_error_t.cpp"
529529
"../../src/error/transaction_error_t.cpp"
530-
"../../src/filter/golomb_coding.cpp"
530+
"../../src/filter/golomb.cpp"
531531
"../../src/hash/accumulator.cpp"
532532
"../../src/hash/checksum.cpp"
533533
"../../src/hash/siphash.cpp"
@@ -555,7 +555,7 @@ add_library( ${CANONICAL_LIB_NAME}
555555
"../../src/unicode/utf8_everywhere/unicode_streambuf.cpp"
556556
"../../src/wallet/context.cpp"
557557
"../../src/wallet/message.cpp"
558-
"../../src/wallet/neutrino_filter.cpp"
558+
"../../src/wallet/neutrino.cpp"
559559
"../../src/wallet/point_value.cpp"
560560
"../../src/wallet/points_value.cpp"
561561
"../../src/wallet/addresses/bitcoin_uri.cpp"
@@ -764,6 +764,9 @@ if (with-tests)
764764
"../../test/error/op_error_t.cpp"
765765
"../../test/error/script_error_t.cpp"
766766
"../../test/error/transaction_error_t.cpp"
767+
"../../test/filter/bloom.cpp"
768+
"../../test/filter/golomb.cpp"
769+
"../../test/filter/sieve.cpp"
767770
"../../test/hash/accumulator.cpp"
768771
"../../test/hash/checksum.cpp"
769772
"../../test/hash/functions.cpp"
@@ -855,7 +858,7 @@ if (with-tests)
855858
"../../test/utreexo/utreexo.hpp"
856859
"../../test/wallet/context.cpp"
857860
"../../test/wallet/message.cpp"
858-
"../../test/wallet/neutrino_filter.cpp"
861+
"../../test/wallet/neutrino.cpp"
859862
"../../test/wallet/point_value.cpp"
860863
"../../test/wallet/points_value.cpp"
861864
"../../test/wallet/addresses/bitcoin_uri.cpp"

‎builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@
144144
<ClCompile Include="..\..\..\..\test\error\op_error_t.cpp" />
145145
<ClCompile Include="..\..\..\..\test\error\script_error_t.cpp" />
146146
<ClCompile Include="..\..\..\..\test\error\transaction_error_t.cpp" />
147+
<ClCompile Include="..\..\..\..\test\filter\bloom.cpp" />
148+
<ClCompile Include="..\..\..\..\test\filter\golomb.cpp" />
149+
<ClCompile Include="..\..\..\..\test\filter\sieve.cpp" />
147150
<ClCompile Include="..\..\..\..\test\funclets.cpp" />
148151
<ClCompile Include="..\..\..\..\test\hacks.cpp" />
149152
<ClCompile Include="..\..\..\..\test\hash\accumulator.cpp" />
@@ -279,7 +282,7 @@
279282
<ClCompile Include="..\..\..\..\test\wallet\mnemonics\mnemonic.cpp">
280283
<ObjectFileName>$(IntDir)test_wallet_mnemonics_mnemonic.obj</ObjectFileName>
281284
</ClCompile>
282-
<ClCompile Include="..\..\..\..\test\wallet\neutrino_filter.cpp" />
285+
<ClCompile Include="..\..\..\..\test\wallet\neutrino.cpp" />
283286
<ClCompile Include="..\..\..\..\test\wallet\point_value.cpp" />
284287
<ClCompile Include="..\..\..\..\test\wallet\points_value.cpp" />
285288
<ClCompile Include="..\..\..\..\test\words\catalogs\electrum.cpp">

‎builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj.filters‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000001}</UniqueIdentifier>
1515
</Filter>
1616
<Filter Include="src\chain\enums">
17-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000003}</UniqueIdentifier>
17+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000004}</UniqueIdentifier>
1818
</Filter>
1919
<Filter Include="src\config">
2020
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000002}</UniqueIdentifier>
@@ -31,77 +31,80 @@
3131
<Filter Include="src\error">
3232
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000006}</UniqueIdentifier>
3333
</Filter>
34-
<Filter Include="src\hash">
34+
<Filter Include="src\filter">
3535
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000007}</UniqueIdentifier>
3636
</Filter>
37+
<Filter Include="src\hash">
38+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
39+
</Filter>
3740
<Filter Include="src\hash\performance">
38-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000004}</UniqueIdentifier>
41+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000005}</UniqueIdentifier>
3942
</Filter>
4043
<Filter Include="src\hash\performance\baseline">
41-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000007}</UniqueIdentifier>
44+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
4245
</Filter>
4346
<Filter Include="src\hash\rmd">
44-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000005}</UniqueIdentifier>
47+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000006}</UniqueIdentifier>
4548
</Filter>
4649
<Filter Include="src\hash\sha">
47-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000006}</UniqueIdentifier>
50+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000007}</UniqueIdentifier>
4851
</Filter>
4952
<Filter Include="src\intrinsics">
50-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
53+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
5154
</Filter>
5255
<Filter Include="src\intrinsics\xcpu">
53-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000008}</UniqueIdentifier>
56+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
5457
</Filter>
5558
<Filter Include="src\machine">
56-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
59+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000A}</UniqueIdentifier>
5760
</Filter>
5861
<Filter Include="src\math">
59-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000A}</UniqueIdentifier>
62+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000B}</UniqueIdentifier>
6063
</Filter>
6164
<Filter Include="src\radix">
62-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000B}</UniqueIdentifier>
65+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000C}</UniqueIdentifier>
6366
</Filter>
6467
<Filter Include="src\serial">
65-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000C}</UniqueIdentifier>
68+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000D}</UniqueIdentifier>
6669
</Filter>
6770
<Filter Include="src\stream">
68-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000D}</UniqueIdentifier>
71+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000E}</UniqueIdentifier>
6972
</Filter>
7073
<Filter Include="src\stream\devices">
71-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000009}</UniqueIdentifier>
74+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000010}</UniqueIdentifier>
7275
</Filter>
7376
<Filter Include="src\stream\iostream">
74-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000010}</UniqueIdentifier>
77+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
7578
</Filter>
7679
<Filter Include="src\stream\streamers">
77-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000A1}</UniqueIdentifier>
80+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
7881
</Filter>
7982
<Filter Include="src\unicode">
80-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000E}</UniqueIdentifier>
83+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000F}</UniqueIdentifier>
8184
</Filter>
8285
<Filter Include="src\unicode\utf8_everywhere">
83-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000B1}</UniqueIdentifier>
86+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
8487
</Filter>
8588
<Filter Include="src\utreexo">
86-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-00000000000F}</UniqueIdentifier>
89+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000001}</UniqueIdentifier>
8790
</Filter>
8891
<Filter Include="src\wallet">
89-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000001}</UniqueIdentifier>
92+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000002}</UniqueIdentifier>
9093
</Filter>
9194
<Filter Include="src\wallet\addresses">
92-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000C1}</UniqueIdentifier>
95+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
9396
</Filter>
9497
<Filter Include="src\wallet\keys">
95-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000D1}</UniqueIdentifier>
98+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
9699
</Filter>
97100
<Filter Include="src\wallet\mnemonics">
98-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000E1}</UniqueIdentifier>
101+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000F1}</UniqueIdentifier>
99102
</Filter>
100103
<Filter Include="src\words">
101-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000002}</UniqueIdentifier>
104+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000003}</UniqueIdentifier>
102105
</Filter>
103106
<Filter Include="src\words\catalogs">
104-
<UniqueIdentifier>{51A424A9-2C12-4211-0000-0000000000F1}</UniqueIdentifier>
107+
<UniqueIdentifier>{51A424A9-2C12-4211-0000-000000000002}</UniqueIdentifier>
105108
</Filter>
106109
</ItemGroup>
107110
<ItemGroup>
@@ -303,6 +306,15 @@
303306
<ClCompile Include="..\..\..\..\test\error\transaction_error_t.cpp">
304307
<Filter>src\error</Filter>
305308
</ClCompile>
309+
<ClCompile Include="..\..\..\..\test\filter\bloom.cpp">
310+
<Filter>src\filter</Filter>
311+
</ClCompile>
312+
<ClCompile Include="..\..\..\..\test\filter\golomb.cpp">
313+
<Filter>src\filter</Filter>
314+
</ClCompile>
315+
<ClCompile Include="..\..\..\..\test\filter\sieve.cpp">
316+
<Filter>src\filter</Filter>
317+
</ClCompile>
306318
<ClCompile Include="..\..\..\..\test\funclets.cpp">
307319
<Filter>src</Filter>
308320
</ClCompile>
@@ -642,7 +654,7 @@
642654
<ClCompile Include="..\..\..\..\test\wallet\mnemonics\mnemonic.cpp">
643655
<Filter>src\wallet\mnemonics</Filter>
644656
</ClCompile>
645-
<ClCompile Include="..\..\..\..\test\wallet\neutrino_filter.cpp">
657+
<ClCompile Include="..\..\..\..\test\wallet\neutrino.cpp">
646658
<Filter>src\wallet</Filter>
647659
</ClCompile>
648660
<ClCompile Include="..\..\..\..\test\wallet\point_value.cpp">

‎builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<ClCompile Include="..\..\..\..\src\error\op_error_t.cpp" />
152152
<ClCompile Include="..\..\..\..\src\error\script_error_t.cpp" />
153153
<ClCompile Include="..\..\..\..\src\error\transaction_error_t.cpp" />
154-
<ClCompile Include="..\..\..\..\src\filter\golomb_coding.cpp" />
154+
<ClCompile Include="..\..\..\..\src\filter\golomb.cpp" />
155155
<ClCompile Include="..\..\..\..\src\hash\accumulator.cpp" />
156156
<ClCompile Include="..\..\..\..\src\hash\checksum.cpp" />
157157
<ClCompile Include="..\..\..\..\src\hash\siphash.cpp" />
@@ -224,7 +224,7 @@
224224
<ClCompile Include="..\..\..\..\src\wallet\mnemonics\mnemonic.cpp">
225225
<ObjectFileName>$(IntDir)src_wallet_mnemonics_mnemonic.obj</ObjectFileName>
226226
</ClCompile>
227-
<ClCompile Include="..\..\..\..\src\wallet\neutrino_filter.cpp" />
227+
<ClCompile Include="..\..\..\..\src\wallet\neutrino.cpp" />
228228
<ClCompile Include="..\..\..\..\src\wallet\point_value.cpp" />
229229
<ClCompile Include="..\..\..\..\src\wallet\points_value.cpp" />
230230
<ClCompile Include="..\..\..\..\src\words\catalogs\electrum.cpp">
@@ -331,8 +331,10 @@
331331
<ClInclude Include="..\..\..\..\include\bitcoin\system\error\transaction_error_t.hpp" />
332332
<ClInclude Include="..\..\..\..\include\bitcoin\system\exceptions.hpp" />
333333
<ClInclude Include="..\..\..\..\include\bitcoin\system\execution.hpp" />
334+
<ClInclude Include="..\..\..\..\include\bitcoin\system\filter\bloom.hpp" />
334335
<ClInclude Include="..\..\..\..\include\bitcoin\system\filter\filter.hpp" />
335-
<ClInclude Include="..\..\..\..\include\bitcoin\system\filter\golomb_coding.hpp" />
336+
<ClInclude Include="..\..\..\..\include\bitcoin\system\filter\golomb.hpp" />
337+
<ClInclude Include="..\..\..\..\include\bitcoin\system\filter\sieve.hpp" />
336338
<ClInclude Include="..\..\..\..\include\bitcoin\system\forks.hpp" />
337339
<ClInclude Include="..\..\..\..\include\bitcoin\system\funclets.hpp" />
338340
<ClInclude Include="..\..\..\..\include\bitcoin\system\hash\accumulator.hpp" />
@@ -480,7 +482,7 @@
480482
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\mnemonics\electrum.hpp" />
481483
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\mnemonics\electrum_v1.hpp" />
482484
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\mnemonics\mnemonic.hpp" />
483-
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\neutrino_filter.hpp" />
485+
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\neutrino.hpp" />
484486
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\point_value.hpp" />
485487
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\points_value.hpp" />
486488
<ClInclude Include="..\..\..\..\include\bitcoin\system\wallet\wallet.hpp" />
@@ -533,6 +535,8 @@
533535
<None Include="..\..\..\..\include\bitcoin\system\impl\endian\swaps.ipp" />
534536
<None Include="..\..\..\..\include\bitcoin\system\impl\endian\uintx_t.ipp" />
535537
<None Include="..\..\..\..\include\bitcoin\system\impl\endian\unsafe.ipp" />
538+
<None Include="..\..\..\..\include\bitcoin\system\impl\filter\bloom.ipp" />
539+
<None Include="..\..\..\..\include\bitcoin\system\impl\filter\sieve.ipp" />
536540
<None Include="..\..\..\..\include\bitcoin\system\impl\hash\accumulator.ipp" />
537541
<None Include="..\..\..\..\include\bitcoin\system\impl\hash\checksum.ipp" />
538542
<None Include="..\..\..\..\include\bitcoin\system\impl\hash\functions.ipp" />

0 commit comments

Comments
 (0)