Skip to content
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

Reorganize table code and related schema namespaces. #459

Merged
merged 4 commits into from
May 4, 2024
Merged

Reorganize table code and related schema namespaces. #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d868094
Disable deprecated table settings.
evoskuil May 4, 2024
667e24a
Rename spend table file to archive-spend.
evoskuil May 4, 2024
2b04e80
Comment.
evoskuil May 4, 2024
69cb326
Reorganize table code and related schema namespaces.
evoskuil May 4, 2024
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
13 changes: 8 additions & 5 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,24 +222,27 @@ include_bitcoin_database_tables_archives_HEADERS = \
include/bitcoin/database/tables/archives/output.hpp \
include/bitcoin/database/tables/archives/point.hpp \
include/bitcoin/database/tables/archives/puts.hpp \
include/bitcoin/database/tables/archives/spend.hpp \
include/bitcoin/database/tables/archives/transaction.hpp \
include/bitcoin/database/tables/archives/txs.hpp

include_bitcoin_database_tables_cachesdir = ${includedir}/bitcoin/database/tables/caches
include_bitcoin_database_tables_caches_HEADERS = \
include/bitcoin/database/tables/caches/bootstrap.hpp \
include/bitcoin/database/tables/caches/buffer.hpp \
include/bitcoin/database/tables/caches/neutrino.hpp \
include/bitcoin/database/tables/caches/validated_bk.hpp \
include/bitcoin/database/tables/caches/validated_tx.hpp

include_bitcoin_database_tables_indexesdir = ${includedir}/bitcoin/database/tables/indexes
include_bitcoin_database_tables_indexes_HEADERS = \
include/bitcoin/database/tables/indexes/address.hpp \
include/bitcoin/database/tables/indexes/height.hpp \
include/bitcoin/database/tables/indexes/spend.hpp \
include/bitcoin/database/tables/indexes/strong_tx.hpp

include_bitcoin_database_tables_optionalsdir = ${includedir}/bitcoin/database/tables/optionals
include_bitcoin_database_tables_optionals_HEADERS = \
include/bitcoin/database/tables/optionals/address.hpp \
include/bitcoin/database/tables/optionals/bootstrap.hpp \
include/bitcoin/database/tables/optionals/buffer.hpp \
include/bitcoin/database/tables/optionals/neutrino.hpp


# Custom make targets.
#==============================================================================
Expand Down
10 changes: 5 additions & 5 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 @@ -122,19 +122,19 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\output.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\point.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\puts.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\spend.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\transaction.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\txs.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\bootstrap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\buffer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\neutrino.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_tx.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\context.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\event.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\address.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\height.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\spend.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\strong_tx.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\address.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\bootstrap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\buffer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\neutrino.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\schema.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\table.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\tables.hpp" />
Expand Down
35 changes: 19 additions & 16 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 @@ -55,9 +55,12 @@
<Filter Include="include\bitcoin\database\tables\indexes">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<Filter Include="include\bitcoin\database\tables\optionals">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{62D7FBEE-4D52-424A-0000-000000000000}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -218,21 +221,15 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\puts.hpp">
<Filter>include\bitcoin\database\tables\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\spend.hpp">
<Filter>include\bitcoin\database\tables\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\transaction.hpp">
<Filter>include\bitcoin\database\tables\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\txs.hpp">
<Filter>include\bitcoin\database\tables\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\bootstrap.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\buffer.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\neutrino.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
Expand All @@ -245,18 +242,24 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\event.hpp">
<Filter>include\bitcoin\database\tables</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\address.hpp">
<Filter>include\bitcoin\database\tables\indexes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\height.hpp">
<Filter>include\bitcoin\database\tables\indexes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\spend.hpp">
<Filter>include\bitcoin\database\tables\indexes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\strong_tx.hpp">
<Filter>include\bitcoin\database\tables\indexes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\address.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\bootstrap.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\buffer.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\neutrino.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\schema.hpp">
<Filter>include\bitcoin\database\tables</Filter>
</ClInclude>
Expand Down
10 changes: 5 additions & 5 deletions include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@
#include <bitcoin/database/tables/archives/output.hpp>
#include <bitcoin/database/tables/archives/point.hpp>
#include <bitcoin/database/tables/archives/puts.hpp>
#include <bitcoin/database/tables/archives/spend.hpp>
#include <bitcoin/database/tables/archives/transaction.hpp>
#include <bitcoin/database/tables/archives/txs.hpp>
#include <bitcoin/database/tables/caches/bootstrap.hpp>
#include <bitcoin/database/tables/caches/buffer.hpp>
#include <bitcoin/database/tables/caches/neutrino.hpp>
#include <bitcoin/database/tables/caches/validated_bk.hpp>
#include <bitcoin/database/tables/caches/validated_tx.hpp>
#include <bitcoin/database/tables/indexes/address.hpp>
#include <bitcoin/database/tables/indexes/height.hpp>
#include <bitcoin/database/tables/indexes/spend.hpp>
#include <bitcoin/database/tables/indexes/strong_tx.hpp>
#include <bitcoin/database/tables/optionals/address.hpp>
#include <bitcoin/database/tables/optionals/bootstrap.hpp>
#include <bitcoin/database/tables/optionals/buffer.hpp>
#include <bitcoin/database/tables/optionals/neutrino.hpp>

#endif
2 changes: 0 additions & 2 deletions include/bitcoin/database/error.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,6 @@ enum error_t : uint8_t
restore_table,
verify_table,

/// states

/// tx fully valid in the given header context.
tx_connected,

Expand Down
Loading
Loading