Skip to content

Refactor types.hpp, change history and unspent to use < and == . #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
Apr 13, 2026
Merged

Refactor types.hpp, change history and unspent to use < and == . #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b253eba
Refactor types.hpp/cpp.
evoskuil Apr 13, 2026
3e6a82e
Change history and unspent to use < and == operators.
evoskuil Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ src_libbitcoin_database_la_SOURCES = \
src/define.cpp \
src/error.cpp \
src/settings.cpp \
src/types.cpp \
src/file/rotator.cpp \
src/file/utilities.cpp \
src/locks/file_lock.cpp \
Expand All @@ -47,7 +46,9 @@ src_libbitcoin_database_la_SOURCES = \
src/memory/map.cpp \
src/memory/utilities.cpp \
src/memory/mman-win32/mman.cpp \
src/memory/mman-win32/mman.hpp
src/memory/mman-win32/mman.hpp \
src/types/history.cpp \
src/types/unspent.cpp

# local: test/libbitcoin-database-test
#------------------------------------------------------------------------------
Expand All @@ -65,7 +66,6 @@ test_libbitcoin_database_test_SOURCES = \
test/store.cpp \
test/test.cpp \
test/test.hpp \
test/types.cpp \
test/file/rotator.cpp \
test/file/utilities.cpp \
test/locks/file_lock.cpp \
Expand Down Expand Up @@ -141,7 +141,10 @@ test_libbitcoin_database_test_SOURCES = \
test/tables/indexes/strong_tx.cpp \
test/tables/optional/address.cpp \
test/tables/optional/filter_bk.cpp \
test/tables/optional/filter_tx.cpp
test/tables/optional/filter_tx.cpp \
test/types/history.cpp \
test/types/span.cpp \
test/types/unspent.cpp

endif WITH_TESTS

Expand Down Expand Up @@ -171,7 +174,6 @@ include_bitcoin_database_HEADERS = \
include/bitcoin/database/query.hpp \
include/bitcoin/database/settings.hpp \
include/bitcoin/database/store.hpp \
include/bitcoin/database/types.hpp \
include/bitcoin/database/version.hpp

include_bitcoin_database_filedir = ${includedir}/bitcoin/database/file
Expand Down Expand Up @@ -329,6 +331,17 @@ include_bitcoin_database_tables_optionals_HEADERS = \
include/bitcoin/database/tables/optionals/filter_bk.hpp \
include/bitcoin/database/tables/optionals/filter_tx.hpp

include_bitcoin_database_typesdir = ${includedir}/bitcoin/database/types
include_bitcoin_database_types_HEADERS = \
include/bitcoin/database/types/fee_rate.hpp \
include/bitcoin/database/types/header_state.hpp \
include/bitcoin/database/types/history.hpp \
include/bitcoin/database/types/position.hpp \
include/bitcoin/database/types/span.hpp \
include/bitcoin/database/types/type.hpp \
include/bitcoin/database/types/types.hpp \
include/bitcoin/database/types/unspent.hpp


# Custom make targets.
#==============================================================================
Expand Down
4 changes: 3 additions & 1 deletion builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@
<ClCompile Include="..\..\..\..\test\test.cpp">
<ObjectFileName>$(IntDir)test_test.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\types.cpp" />
<ClCompile Include="..\..\..\..\test\types\history.cpp" />
<ClCompile Include="..\..\..\..\test\types\span.cpp" />
<ClCompile Include="..\..\..\..\test\types\unspent.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\mocks\blocks.hpp" />
Expand Down
29 changes: 19 additions & 10 deletions builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,34 @@
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="src\query\address">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="src\query\archive">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src\query\consensus">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="src\query\navigate">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables\archives">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables\caches">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000D}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables\indexes">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000E}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000F}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables\optional">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000F}</UniqueIdentifier>
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\types">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-000000000008}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -288,8 +291,14 @@
<ClCompile Include="..\..\..\..\test\test.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\types.cpp">
<Filter>src</Filter>
<ClCompile Include="..\..\..\..\test\types\history.cpp">
<Filter>src\types</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\types\span.cpp">
<Filter>src\types</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\types\unspent.cpp">
<Filter>src\types</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
12 changes: 10 additions & 2 deletions builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@
<ObjectFileName>$(IntDir)src_memory_utilities.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\src\settings.cpp" />
<ClCompile Include="..\..\..\..\src\types.cpp" />
<ClCompile Include="..\..\..\..\src\types\history.cpp" />
<ClCompile Include="..\..\..\..\src\types\unspent.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\bitcoin\database.hpp" />
Expand Down Expand Up @@ -201,7 +202,14 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\states.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\table.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\tables.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\fee_rate.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\header_state.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\history.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\position.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\span.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\type.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\types.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\unspent.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\version.hpp" />
<ClInclude Include="..\..\..\..\src\memory\mman-win32\mman.hpp" />
</ItemGroup>
Expand Down
82 changes: 56 additions & 26 deletions builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,70 +8,73 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000005}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000006}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000007}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\file">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\memory">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000E}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\primitives">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000F}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\query">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000001}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\query\address">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000002}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000004}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\query\archive">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000003}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\query\consensus">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000004}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\impl\query\navigate">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000005}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\locks">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\memory">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\memory\interfaces">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000006}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\primitives">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\tables">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000D}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\tables\archives">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000007}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\tables\caches">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000010}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\tables\indexes">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-0000000000A1}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\tables\optionals">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000010}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-0000000000B1}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\database\types">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-00000000000F}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-0000000000A1}</UniqueIdentifier>
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-0000000000C1}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000000}</UniqueIdentifier>
Expand All @@ -86,6 +89,9 @@
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="src\memory\mman-win32">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="src\types">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000004}</UniqueIdentifier>
</Filter>
</ItemGroup>
Expand Down Expand Up @@ -123,8 +129,11 @@
<ClCompile Include="..\..\..\..\src\settings.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\types.cpp">
<Filter>src</Filter>
<ClCompile Include="..\..\..\..\src\types\history.cpp">
<Filter>src\types</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\types\unspent.cpp">
<Filter>src\types</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -308,8 +317,29 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\tables.hpp">
<Filter>include\bitcoin\database\tables</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types.hpp">
<Filter>include\bitcoin\database</Filter>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\fee_rate.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\header_state.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\history.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\position.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\span.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\type.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\types.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\types\unspent.hpp">
<Filter>include\bitcoin\database\types</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\version.hpp">
<Filter>include\bitcoin\database</Filter>
Expand Down
9 changes: 8 additions & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <bitcoin/database/query.hpp>
#include <bitcoin/database/settings.hpp>
#include <bitcoin/database/store.hpp>
#include <bitcoin/database/types.hpp>
#include <bitcoin/database/version.hpp>
#include <bitcoin/database/file/file.hpp>
#include <bitcoin/database/file/rotator.hpp>
Expand Down Expand Up @@ -76,5 +75,13 @@
#include <bitcoin/database/tables/optionals/address.hpp>
#include <bitcoin/database/tables/optionals/filter_bk.hpp>
#include <bitcoin/database/tables/optionals/filter_tx.hpp>
#include <bitcoin/database/types/fee_rate.hpp>
#include <bitcoin/database/types/header_state.hpp>
#include <bitcoin/database/types/history.hpp>
#include <bitcoin/database/types/position.hpp>
#include <bitcoin/database/types/span.hpp>
#include <bitcoin/database/types/type.hpp>
#include <bitcoin/database/types/types.hpp>
#include <bitcoin/database/types/unspent.hpp>

#endif
1 change: 0 additions & 1 deletion include/bitcoin/database/impl/query/address/address_unspent.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ code CLASS::parallel_unspent_transform(const stopper& cancel, bool turbo,
return error::success;
}


} // namespace database
} // namespace libbitcoin

Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database/query.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <mutex>
#include <bitcoin/database/define.hpp>
#include <bitcoin/database/settings.hpp>
#include <bitcoin/database/types.hpp>
#include <bitcoin/database/types/types.hpp>

namespace libbitcoin {
namespace database {
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database/store.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <bitcoin/database/define.hpp>
#include <bitcoin/database/locks/locks.hpp>
#include <bitcoin/database/settings.hpp>
#include <bitcoin/database/types.hpp>
#include <bitcoin/database/types/types.hpp>

namespace libbitcoin {
namespace database {
Expand Down
Loading
Loading