Skip to content

Commit 0236ec2

Browse files
HalosGhostHalosGhost
committed
Fix some Lint/CI-related things
Signed-off-by: Sam Stuewe <[email protected]>
1 parent 088ae79 commit 0236ec2

29 files changed

+486
-344
lines changed

‎src/uhs/atomizer/sentinel/controller.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
#include "uhs/sentinel/async_interface.hpp"
1111
#include "uhs/sentinel/client.hpp"
1212
#include "uhs/sentinel/interface.hpp"
13+
#include "uhs/transaction/transaction.hpp"
1314
#include "util/common/config.hpp"
1415
#include "util/network/connection_manager.hpp"
15-
#include "uhs/transaction/transaction.hpp"
16-
17-
#include <secp256k1.h>
18-
#include <secp256k1_bulletproofs.h>
1916

2017
#include <memory>
2118
#include <random>
2219

20+
#include <secp256k1.h>
21+
#include <secp256k1_bulletproofs.h>
22+
2323
namespace cbdc::sentinel {
2424
/// Sentinel implementation.
2525
class controller : public interface {

‎src/uhs/atomizer/shard/shard.cpp

+22-16
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,30 @@ namespace cbdc::shard {
6767
for(const auto& out : tx.m_outputs) {
6868
if(is_output_on_shard(out.m_id)) {
6969
std::array<char, sizeof(out.m_id)> out_arr{};
70-
std::memcpy(out_arr.data(), out.m_id.data(), out.m_id.size());
71-
leveldb::Slice OutPointKey(out_arr.data(), out.m_id.size());
72-
73-
std::array<char, sizeof(out.m_auxiliary) +
74-
sizeof(out.m_range) +
75-
sizeof(out.m_consistency)> proofs_arr{};
76-
auto pptr = proofs_arr.data();
77-
78-
std::memcpy(pptr, out.m_auxiliary.data(),
79-
out.m_auxiliary.size());
80-
pptr += out.m_auxiliary.size();
81-
std::memcpy(pptr, out.m_range.data(), out.m_range.size());
82-
pptr += out.m_range.size();
83-
std::memcpy(pptr, out.m_consistency.data(),
84-
out.m_consistency.size());
70+
std::memcpy(out_arr.data(),
71+
out.m_id.data(),
72+
out.m_id.size());
73+
leveldb::Slice OutPointKey(out_arr.data(),
74+
out.m_id.size());
75+
76+
static constexpr auto aux_size = sizeof(out.m_auxiliary);
77+
static constexpr auto rng_size = sizeof(out.m_range);
78+
static constexpr auto cst_size = sizeof(out.m_consistency);
79+
80+
std::array<char, aux_size + rng_size + cst_size>
81+
proofs_arr{};
82+
std::memcpy(proofs_arr.data(),
83+
out.m_auxiliary.data(),
84+
aux_size);
85+
std::memcpy(proofs_arr.data() + aux_size,
86+
out.m_range.data(),
87+
out.m_range.size());
88+
std::memcpy(proofs_arr.data() + aux_size + rng_size,
89+
out.m_consistency.data(),
90+
cst_size);
8591

8692
leveldb::Slice ProofVal(proofs_arr.data(),
87-
proofs_arr.size());
93+
proofs_arr.size());
8894
batch.Put(OutPointKey, ProofVal);
8995
}
9096
}

‎src/uhs/client/atomizer_client.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace cbdc {
5252
ctx.m_outputs.end(),
5353
std::back_inserter(uhs_ids),
5454
[](transaction::compact_output p) -> hash_t {
55-
return p.m_id;
55+
return p.m_id;
5656
});
5757
it->second.insert(it->second.end(),
5858
uhs_ids.begin(),

‎src/uhs/client/client.hpp

+11-4
Original file line numberDiff line numberDiff line change
@@ -310,18 +310,25 @@ namespace cbdc {
310310
&secp256k1_context_destroy};
311311

312312
struct GensDeleter {
313-
GensDeleter(secp256k1_context* ctx) : m_ctx(ctx) {}
313+
explicit GensDeleter(secp256k1_context* ctx) : m_ctx(ctx) {}
314314

315-
void operator()(secp256k1_bulletproofs_generators* gens) {
315+
void operator()(secp256k1_bulletproofs_generators* gens) const {
316316
secp256k1_bulletproofs_generators_destroy(m_ctx, gens);
317317
}
318318

319319
secp256k1_context* m_ctx;
320320
};
321321

322+
/// should be twice the bitcount of the range-proof's upper bound
323+
///
324+
/// e.g., if proving things in the range [0, 2^64-1], it should be 128.
325+
static const inline auto generator_count = 129;
326+
322327
std::unique_ptr<secp256k1_bulletproofs_generators, GensDeleter>
323-
m_generators{secp256k1_bulletproofs_generators_create(m_secp.get(),
324-
128), GensDeleter(m_secp.get())};
328+
m_generators{
329+
secp256k1_bulletproofs_generators_create(m_secp.get(),
330+
generator_count),
331+
GensDeleter(m_secp.get())};
325332
};
326333
}
327334

‎src/uhs/transaction/messages.cpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ namespace cbdc {
2323
auto operator<<(serializer& packet, const transaction::output& out)
2424
-> serializer& {
2525
return packet << out.m_witness_program_commitment << out.m_id
26-
<< out.m_nonce << out.m_auxiliary << out.m_range
27-
<< out.m_consistency;
26+
<< out.m_nonce << out.m_auxiliary << out.m_range
27+
<< out.m_consistency;
2828
}
2929

3030
auto operator>>(serializer& packet, transaction::output& out)
@@ -37,7 +37,7 @@ namespace cbdc {
3737
auto operator<<(serializer& packet, const transaction::compact_output& out)
3838
-> serializer& {
3939
return packet << out.m_id << out.m_auxiliary << out.m_range
40-
<< out.m_consistency;
40+
<< out.m_consistency;
4141
}
4242

4343
auto operator>>(serializer& packet, transaction::compact_output& out)
@@ -59,7 +59,7 @@ namespace cbdc {
5959
auto operator<<(serializer& packet, const transaction::input& inp)
6060
-> serializer& {
6161
return packet << inp.m_prevout << inp.m_prevout_data
62-
<< inp.m_spend_data;
62+
<< inp.m_spend_data;
6363
}
6464

6565
auto operator>>(serializer& packet, transaction::input& inp)
@@ -71,7 +71,7 @@ namespace cbdc {
7171
auto operator<<(serializer& packet, const transaction::full_tx& tx)
7272
-> serializer& {
7373
return packet << tx.m_inputs << tx.m_outputs << tx.m_witness
74-
<< tx.m_tx_proofs << tx.m_out_spend_data;
74+
<< tx.m_tx_proofs << tx.m_out_spend_data;
7575
}
7676

7777
auto operator>>(serializer& packet, transaction::full_tx& tx)
@@ -81,12 +81,13 @@ namespace cbdc {
8181
}
8282

8383
auto operator<<(serializer& packet,
84-
const transaction::transaction_proof& proof) -> serializer& {
84+
const transaction::transaction_proof& proof)
85+
-> serializer& {
8586
return packet << proof.m_noncesigs;
8687
}
8788

88-
auto operator>>(serializer& packet,
89-
transaction::transaction_proof& proof) -> serializer& {
89+
auto operator>>(serializer& packet, transaction::transaction_proof& proof)
90+
-> serializer& {
9091
return packet >> proof.m_noncesigs;
9192
}
9293

‎src/uhs/transaction/messages.hpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,15 @@ namespace cbdc {
102102
/// \see \ref cbdc::operator<<(serializer&, const std::array<T, len>&)
103103
/// \see \ref cbdc::operator<<(serializer&, const std::vector<T>&)
104104
auto operator<<(serializer& packet,
105-
const transaction::transaction_proof& proof) -> serializer&;
105+
const transaction::transaction_proof& proof)
106+
-> serializer&;
106107

107108
/// \brief Deserializes transaction-wide cryptographic proofs
108109
///
109110
/// Deserializes the vector of signatures on the UHS-ID compression nonces.
110111
/// \see \ref cbdc::operator<<(serializer&, const transaction::transaction_proof&)
111-
auto operator>>(serializer& packet,
112-
transaction::transaction_proof& proof) -> serializer&;
112+
auto operator>>(serializer& packet, transaction::transaction_proof& proof)
113+
-> serializer&;
113114

114115
/// \brief Serializes a compact transaction.
115116
///

0 commit comments

Comments
 (0)