Skip to content

Commit 5e3b161

Browse files
committed
Rename puts to outs, delete spends files.
1 parent e0a18a5 commit 5e3b161

40 files changed

Lines changed: 176 additions & 416 deletions

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
llvm: "llvm@16"
9898
secp256k1: "--build-secp256k1"
9999
cc: "clang"
100-
flags: "-Os -fPIE"
100+
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
101101
options: "--enable-isystem"
102102
packager: "brew"
103103
packages: "llvm@16 icu4c"
@@ -114,7 +114,7 @@ jobs:
114114
llvm: "llvm@16"
115115
secp256k1: "--build-secp256k1"
116116
cc: "clang"
117-
flags: "-Os -fvisibility=hidden -fPIE"
117+
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
118118
options: "--enable-isystem"
119119
packager: "brew"
120120
packages: "llvm@16 icu4c"
@@ -368,7 +368,7 @@ jobs:
368368
llvm: "llvm@16"
369369
secp256k1: "--build-secp256k1"
370370
cc: "clang"
371-
flags: "-Os -fPIE"
371+
flags: "-Os -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
372372
options: ""
373373
packager: "brew"
374374
packages: "llvm@16 icu4c"
@@ -385,7 +385,7 @@ jobs:
385385
llvm: "llvm@16"
386386
secp256k1: "--build-secp256k1"
387387
cc: "clang"
388-
flags: "-Os -fvisibility=hidden -fPIE"
388+
flags: "-Os -fvisibility=hidden -fPIE -DBOOST_NO_CXX98_FUNCTION_BASE"
389389
options: ""
390390
packager: "brew"
391391
packages: "llvm@16 icu4c"

Makefile.am

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ test_libbitcoin_database_test_SOURCES = \
9797
test/tables/archives/output.cpp \
9898
test/tables/archives/point.cpp \
9999
test/tables/archives/puts.cpp \
100-
test/tables/archives/spend.cpp \
101100
test/tables/archives/transaction.cpp \
102101
test/tables/archives/txs.cpp \
103102
test/tables/caches/prevout.cpp \
@@ -234,9 +233,8 @@ include_bitcoin_database_tables_archives_HEADERS = \
234233
include/bitcoin/database/tables/archives/input.hpp \
235234
include/bitcoin/database/tables/archives/ins.hpp \
236235
include/bitcoin/database/tables/archives/output.hpp \
236+
include/bitcoin/database/tables/archives/outs.hpp \
237237
include/bitcoin/database/tables/archives/point.hpp \
238-
include/bitcoin/database/tables/archives/puts.hpp \
239-
include/bitcoin/database/tables/archives/spend.hpp \
240238
include/bitcoin/database/tables/archives/transaction.hpp \
241239
include/bitcoin/database/tables/archives/txs.hpp
242240

builds/cmake/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ if (with-tests)
305305
"../../test/tables/archives/output.cpp"
306306
"../../test/tables/archives/point.cpp"
307307
"../../test/tables/archives/puts.cpp"
308-
"../../test/tables/archives/spend.cpp"
309308
"../../test/tables/archives/transaction.cpp"
310309
"../../test/tables/archives/txs.cpp"
311310
"../../test/tables/caches/prevout.cpp"

builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<ClCompile Include="..\..\..\..\test\tables\archives\output.cpp" />
109109
<ClCompile Include="..\..\..\..\test\tables\archives\point.cpp" />
110110
<ClCompile Include="..\..\..\..\test\tables\archives\puts.cpp" />
111-
<ClCompile Include="..\..\..\..\test\tables\archives\spend.cpp" />
112111
<ClCompile Include="..\..\..\..\test\tables\archives\transaction.cpp" />
113112
<ClCompile Include="..\..\..\..\test\tables\archives\txs.cpp" />
114113
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp" />

builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@
147147
<ClCompile Include="..\..\..\..\test\tables\archives\puts.cpp">
148148
<Filter>src\tables\archives</Filter>
149149
</ClCompile>
150-
<ClCompile Include="..\..\..\..\test\tables\archives\spend.cpp">
151-
<Filter>src\tables\archives</Filter>
152-
</ClCompile>
153150
<ClCompile Include="..\..\..\..\test\tables\archives\transaction.cpp">
154151
<Filter>src\tables\archives</Filter>
155152
</ClCompile>

builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@
129129
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\input.hpp" />
130130
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\ins.hpp" />
131131
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\output.hpp" />
132+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\outs.hpp" />
132133
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\point.hpp" />
133-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\puts.hpp" />
134-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\spend.hpp" />
135134
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\transaction.hpp" />
136135
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\txs.hpp" />
137136
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevout.hpp" />

builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,10 @@
230230
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\output.hpp">
231231
<Filter>include\bitcoin\database\tables\archives</Filter>
232232
</ClInclude>
233-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\point.hpp">
234-
<Filter>include\bitcoin\database\tables\archives</Filter>
235-
</ClInclude>
236-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\puts.hpp">
233+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\outs.hpp">
237234
<Filter>include\bitcoin\database\tables\archives</Filter>
238235
</ClInclude>
239-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\spend.hpp">
236+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\point.hpp">
240237
<Filter>include\bitcoin\database\tables\archives</Filter>
241238
</ClInclude>
242239
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\transaction.hpp">

include/bitcoin/database.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@
6060
#include <bitcoin/database/tables/archives/input.hpp>
6161
#include <bitcoin/database/tables/archives/ins.hpp>
6262
#include <bitcoin/database/tables/archives/output.hpp>
63+
#include <bitcoin/database/tables/archives/outs.hpp>
6364
#include <bitcoin/database/tables/archives/point.hpp>
64-
#include <bitcoin/database/tables/archives/puts.hpp>
65-
#include <bitcoin/database/tables/archives/spend.hpp>
6665
#include <bitcoin/database/tables/archives/transaction.hpp>
6766
#include <bitcoin/database/tables/archives/txs.hpp>
6867
#include <bitcoin/database/tables/caches/prevout.hpp>

include/bitcoin/database/error.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ enum error_t : uint8_t
122122
tx_ins_allocate,
123123
tx_ins_put,
124124
tx_output_put,
125-
tx_puts_put,
125+
tx_outs_put,
126126
tx_tx_set,
127127
tx_address_allocate,
128128
tx_address_put,

include/bitcoin/database/impl/query/archive_write.ipp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
9090
return error::tx_empty;
9191

9292
const auto& ins = tx.inputs_ptr();
93-
const auto& outs = tx.outputs_ptr();
93+
const auto& ous = tx.outputs_ptr();
9494

9595
using ix = linkage<schema::index>;
9696
const auto txs = possible_narrow_cast<tx_link::integer>(one);
9797
const auto inputs = possible_narrow_cast<ix::integer>(ins->size());
98-
const auto outputs = possible_narrow_cast<ix::integer>(outs->size());
98+
const auto outputs = possible_narrow_cast<ix::integer>(ous->size());
9999

100-
// Declare puts record for output accumulation.
101-
table::puts::record puts{};
102-
puts.out_fks.reserve(outputs);
100+
// Declare outs record for output accumulation.
101+
table::outs::record outs{};
102+
outs.out_fks.reserve(outputs);
103103

104104
// ========================================================================
105105
const auto scope = store_.get_transactor();
@@ -147,7 +147,7 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
147147

148148
// TODO: preallocate (requires output sizes).
149149
// Commit output records.
150-
for (const auto& out: *outs)
150+
for (const auto& out: *ous)
151151
{
152152
output_link output_fk{};
153153
if (!store_.output.put_link(output_fk, table::output::put_ref
@@ -161,13 +161,13 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
161161
}
162162

163163
// Accumulate outputs in order.
164-
puts.out_fks.push_back(output_fk);
164+
outs.out_fks.push_back(output_fk);
165165
}
166166

167-
// Commit accumulated puts.
168-
const auto puts_fk = store_.puts.put_link(puts);
169-
if (puts_fk.is_terminal())
170-
return error::tx_puts_put;
167+
// Commit accumulated outs.
168+
const auto outs_fk = store_.outs.put_link(outs);
169+
if (outs_fk.is_terminal())
170+
return error::tx_outs_put;
171171

172172
// Commit accumulated points.
173173
point_it = point_fk;
@@ -189,7 +189,7 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
189189
inputs,
190190
outputs,
191191
point_fk,
192-
puts_fk
192+
outs_fk
193193
}))
194194
{
195195
return error::tx_tx_set;
@@ -202,12 +202,12 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
202202
if (ad_fk.is_terminal())
203203
return error::tx_address_allocate;
204204

205-
auto out = outs->begin();
205+
auto output = ous->begin();
206206
const auto ptr = store_.address.get_memory();
207207

208-
for (auto out_fk: puts.out_fks)
208+
for (auto out_fk: outs.out_fks)
209209
{
210-
const auto key = (*out++)->script().hash();
210+
const auto key = (*output++)->script().hash();
211211
if (!store_.address.put(ptr, ad_fk++, key, table::address::record
212212
{
213213
{},

0 commit comments

Comments
 (0)