Skip to content

Commit 9afff81

Browse files
rockett-mrockett-m
committed
clang format script added to auto-format C++ code; fixes mit-dci#293
Signed-off-by: Morgan Rockett <[email protected]>
1 parent fb29b84 commit 9afff81

File tree

140 files changed

+984
-1032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+984
-1032
lines changed

‎scripts/clang-format.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Usage: ./scripts/clang-format.sh
5+
echo "Running clang format..."
6+
7+
check_format_files=$(git ls-files | grep -E "tools|tests|src|cmake-tests" \
8+
| grep -E "\..*pp")
9+
clang-format -i --style=file ${check_format_files[@]}
10+
11+
echo "Done."

‎src/parsec/agent/client.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace cbdc::parsec::agent::rpc {
1212
client::client(std::vector<network::endpoint_t> endpoints)
1313
: m_client(std::make_unique<decltype(m_client)::element_type>(
14-
std::move(endpoints))) {}
14+
std::move(endpoints))) {}
1515

1616
auto client::init() -> bool {
1717
return m_client->init();

‎src/parsec/agent/client.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ namespace cbdc::parsec::agent::rpc {
3636
/// \param is_readonly_run true if agent should skip writing any state changes.
3737
/// \param result_callback function to call with execution result.
3838
/// \return true if the request was sent successfully.
39-
auto exec(runtime_locking_shard::key_type function,
40-
parameter_type param,
41-
bool is_readonly_run,
42-
const interface::exec_callback_type& result_callback)
43-
-> bool;
39+
auto
40+
exec(runtime_locking_shard::key_type function,
41+
parameter_type param,
42+
bool is_readonly_run,
43+
const interface::exec_callback_type& result_callback) -> bool;
4444

4545
private:
4646
std::unique_ptr<cbdc::rpc::tcp_client<request, response>> m_client;

‎src/parsec/agent/format.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
#include "util/serialization/format.hpp"
99

1010
namespace cbdc {
11-
auto operator<<(serializer& ser, const parsec::agent::rpc::request& req)
12-
-> serializer& {
11+
auto operator<<(serializer& ser,
12+
const parsec::agent::rpc::request& req) -> serializer& {
1313
return ser << req.m_function << req.m_param << req.m_is_readonly_run;
1414
}
1515

16-
auto operator>>(serializer& deser, parsec::agent::rpc::request& req)
17-
-> serializer& {
16+
auto operator>>(serializer& deser,
17+
parsec::agent::rpc::request& req) -> serializer& {
1818
return deser >> req.m_function >> req.m_param >> req.m_is_readonly_run;
1919
}
2020
}

‎src/parsec/agent/format.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include "util/serialization/serializer.hpp"
1111

1212
namespace cbdc {
13-
auto operator<<(serializer& ser, const parsec::agent::rpc::request& req)
14-
-> serializer&;
15-
auto operator>>(serializer& deser, parsec::agent::rpc::request& req)
16-
-> serializer&;
13+
auto operator<<(serializer& ser,
14+
const parsec::agent::rpc::request& req) -> serializer&;
15+
auto operator>>(serializer& deser,
16+
parsec::agent::rpc::request& req) -> serializer&;
1717
}
1818

1919
#endif

‎src/parsec/agent/impl.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,10 @@ namespace cbdc::parsec::agent {
188188
res_cb(std::move(res));
189189
}
190190

191-
auto
192-
impl::do_try_lock_request(broker::key_type key,
193-
broker::lock_type locktype,
194-
broker::interface::try_lock_callback_type res_cb)
195-
-> bool {
191+
auto impl::do_try_lock_request(
192+
broker::key_type key,
193+
broker::lock_type locktype,
194+
broker::interface::try_lock_callback_type res_cb) -> bool {
196195
// TODO: permissions for keys
197196
std::unique_lock l(m_mut);
198197
assert(m_ticket_number.has_value());

‎src/parsec/agent/impl.hpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,10 @@ namespace cbdc::parsec::agent {
147147

148148
/// Request the broker to attempt to lock the parameterized key
149149
/// \return true is returned unless the system is in an unexpected state
150-
[[nodiscard]] auto
151-
do_try_lock_request(broker::key_type key,
152-
broker::lock_type locktype,
153-
broker::interface::try_lock_callback_type res_cb)
154-
-> bool;
150+
[[nodiscard]] auto do_try_lock_request(
151+
broker::key_type key,
152+
broker::lock_type locktype,
153+
broker::interface::try_lock_callback_type res_cb) -> bool;
155154

156155
void
157156
handle_rollback(broker::interface::rollback_return_type rollback_res);

‎src/parsec/agent/interface.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ namespace cbdc::parsec::agent {
6666

6767
/// Return the key of the function bytecode managed by this agent.
6868
/// \return function bytecode key.
69-
[[nodiscard]] auto get_function() const
70-
-> runtime_locking_shard::key_type;
69+
[[nodiscard]] auto
70+
get_function() const -> runtime_locking_shard::key_type;
7171

7272
/// Return the function parameter managed by this agent.
7373
/// \return function parameter.

‎src/parsec/agent/runners/evm/address.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ namespace cbdc::parsec::agent::runner {
3030
return new_addr;
3131
}
3232

33-
auto contract_address2(const evmc::address& sender,
34-
const evmc::bytes32& salt,
35-
const cbdc::hash_t& bytecode_hash)
36-
-> evmc::address {
33+
auto
34+
contract_address2(const evmc::address& sender,
35+
const evmc::bytes32& salt,
36+
const cbdc::hash_t& bytecode_hash) -> evmc::address {
3737
// Specs: https://eips.ethereum.org/EIPS/eip-1014
3838

3939
auto new_addr = evmc::address();
@@ -53,9 +53,9 @@ namespace cbdc::parsec::agent::runner {
5353
return new_addr;
5454
}
5555

56-
auto eth_addr(const std::unique_ptr<secp256k1_pubkey>& pk,
57-
const std::shared_ptr<secp256k1_context>& ctx)
58-
-> evmc::address {
56+
auto
57+
eth_addr(const std::unique_ptr<secp256k1_pubkey>& pk,
58+
const std::shared_ptr<secp256k1_context>& ctx) -> evmc::address {
5959
static constexpr int uncompressed_pubkey_len = 65;
6060
auto pubkey_serialized
6161
= std::array<unsigned char, uncompressed_pubkey_len>();
@@ -84,9 +84,9 @@ namespace cbdc::parsec::agent::runner {
8484
return addr;
8585
}
8686

87-
auto eth_addr(const cbdc::privkey_t& key,
88-
const std::shared_ptr<secp256k1_context>& ctx)
89-
-> evmc::address {
87+
auto
88+
eth_addr(const cbdc::privkey_t& key,
89+
const std::shared_ptr<secp256k1_context>& ctx) -> evmc::address {
9090
auto pk = std::make_unique<secp256k1_pubkey>();
9191
[[maybe_unused]] const auto pub_ret
9292
= ::secp256k1_ec_pubkey_create(ctx.get(), pk.get(), key.data());

‎src/parsec/agent/runners/evm/address.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ namespace cbdc::parsec::agent::runner {
4141
/// \param key key to calculate the address for
4242
/// \param ctx secp256k1 context to use
4343
/// \return the address corresponding to the passed private key
44-
auto eth_addr(const cbdc::privkey_t& key,
45-
const std::shared_ptr<secp256k1_context>& ctx)
46-
-> evmc::address;
44+
auto
45+
eth_addr(const cbdc::privkey_t& key,
46+
const std::shared_ptr<secp256k1_context>& ctx) -> evmc::address;
4747

4848
/// Calculates an eth address from a public key
4949
/// \param pk key to calculate the address for
5050
/// \param ctx secp256k1 context to use
5151
/// \return the address corresponding to the passed public key
52-
auto eth_addr(const std::unique_ptr<secp256k1_pubkey>& pk,
53-
const std::shared_ptr<secp256k1_context>& ctx)
54-
-> evmc::address;
52+
auto
53+
eth_addr(const std::unique_ptr<secp256k1_pubkey>& pk,
54+
const std::shared_ptr<secp256k1_context>& ctx) -> evmc::address;
5555
}
5656

5757
#endif

‎src/parsec/agent/runners/evm/format.cpp

+43-43
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
#include "util/serialization/format.hpp"
99

1010
namespace cbdc {
11-
auto operator<<(serializer& ser,
12-
const parsec::agent::runner::evm_account& acc)
13-
-> serializer& {
11+
auto
12+
operator<<(serializer& ser,
13+
const parsec::agent::runner::evm_account& acc) -> serializer& {
1414
return ser << acc.m_balance << acc.m_nonce;
1515
}
1616

17-
auto operator>>(serializer& deser, parsec::agent::runner::evm_account& acc)
18-
-> serializer& {
17+
auto operator>>(serializer& deser,
18+
parsec::agent::runner::evm_account& acc) -> serializer& {
1919
return deser >> acc.m_balance >> acc.m_nonce;
2020
}
2121

22-
auto operator<<(serializer& ser, const evmc::address& addr)
23-
-> serializer& {
22+
auto operator<<(serializer& ser,
23+
const evmc::address& addr) -> serializer& {
2424
ser.write(addr.bytes, sizeof(addr.bytes));
2525
return ser;
2626
}
@@ -40,12 +40,12 @@ namespace cbdc {
4040
return deser;
4141
}
4242

43-
auto operator<<(serializer& ser, const parsec::agent::runner::evm_sig& s)
44-
-> serializer& {
43+
auto operator<<(serializer& ser,
44+
const parsec::agent::runner::evm_sig& s) -> serializer& {
4545
return ser << s.m_v << s.m_r << s.m_s;
4646
}
47-
auto operator>>(serializer& deser, parsec::agent::runner::evm_sig& s)
48-
-> serializer& {
47+
auto operator>>(serializer& deser,
48+
parsec::agent::runner::evm_sig& s) -> serializer& {
4949
return deser >> s.m_v >> s.m_r >> s.m_s;
5050
}
5151

@@ -55,30 +55,30 @@ namespace cbdc {
5555
return ser << at.m_address << at.m_storage_keys;
5656
}
5757

58-
auto operator>>(serializer& deser,
59-
parsec::agent::runner::evm_access_tuple& at)
60-
-> serializer& {
58+
auto
59+
operator>>(serializer& deser,
60+
parsec::agent::runner::evm_access_tuple& at) -> serializer& {
6161
return deser >> at.m_address >> at.m_storage_keys;
6262
}
6363

64-
auto operator<<(serializer& ser, const parsec::agent::runner::evm_tx& tx)
65-
-> serializer& {
64+
auto operator<<(serializer& ser,
65+
const parsec::agent::runner::evm_tx& tx) -> serializer& {
6666
return ser << tx.m_type << tx.m_to << tx.m_value << tx.m_nonce
6767
<< tx.m_gas_price << tx.m_gas_limit << tx.m_gas_tip_cap
6868
<< tx.m_gas_fee_cap << tx.m_input << tx.m_access_list
6969
<< tx.m_sig;
7070
}
7171

72-
auto operator>>(serializer& deser, parsec::agent::runner::evm_tx& tx)
73-
-> serializer& {
72+
auto operator>>(serializer& deser,
73+
parsec::agent::runner::evm_tx& tx) -> serializer& {
7474
return deser >> tx.m_type >> tx.m_to >> tx.m_value >> tx.m_nonce
7575
>> tx.m_gas_price >> tx.m_gas_limit >> tx.m_gas_tip_cap
7676
>> tx.m_gas_fee_cap >> tx.m_input >> tx.m_access_list >> tx.m_sig;
7777
}
7878

79-
auto operator<<(serializer& ser,
80-
const parsec::agent::runner::evm_dryrun_tx& tx)
81-
-> serializer& {
79+
auto
80+
operator<<(serializer& ser,
81+
const parsec::agent::runner::evm_dryrun_tx& tx) -> serializer& {
8282
return ser << tx.m_from << tx.m_tx;
8383
}
8484

@@ -87,19 +87,19 @@ namespace cbdc {
8787
return deser >> tx.m_from >> tx.m_tx;
8888
}
8989

90-
auto operator<<(serializer& ser, const parsec::agent::runner::evm_log& l)
91-
-> serializer& {
90+
auto operator<<(serializer& ser,
91+
const parsec::agent::runner::evm_log& l) -> serializer& {
9292
return ser << l.m_addr << l.m_data << l.m_topics;
9393
}
9494

95-
auto operator>>(serializer& deser, parsec::agent::runner::evm_log& l)
96-
-> serializer& {
95+
auto operator>>(serializer& deser,
96+
parsec::agent::runner::evm_log& l) -> serializer& {
9797
return deser >> l.m_addr >> l.m_data >> l.m_topics;
9898
}
9999

100-
auto operator<<(serializer& ser,
101-
const parsec::agent::runner::evm_tx_receipt& r)
102-
-> serializer& {
100+
auto
101+
operator<<(serializer& ser,
102+
const parsec::agent::runner::evm_tx_receipt& r) -> serializer& {
103103
return ser << r.m_tx << r.m_create_address << r.m_gas_used << r.m_logs
104104
<< r.m_output_data << r.m_ticket_number << r.m_timestamp
105105
<< r.m_success;
@@ -112,30 +112,30 @@ namespace cbdc {
112112
>> r.m_timestamp >> r.m_success;
113113
}
114114

115-
auto operator<<(serializer& ser, const parsec::agent::runner::code_key& k)
116-
-> serializer& {
115+
auto operator<<(serializer& ser,
116+
const parsec::agent::runner::code_key& k) -> serializer& {
117117
return ser << k.m_addr << uint8_t{};
118118
}
119119

120-
auto operator>>(serializer& deser, parsec::agent::runner::code_key& k)
121-
-> serializer& {
120+
auto operator>>(serializer& deser,
121+
parsec::agent::runner::code_key& k) -> serializer& {
122122
uint8_t b{};
123123
return deser >> k.m_addr >> b;
124124
}
125125

126-
auto operator<<(serializer& ser,
127-
const parsec::agent::runner::storage_key& k)
128-
-> serializer& {
126+
auto
127+
operator<<(serializer& ser,
128+
const parsec::agent::runner::storage_key& k) -> serializer& {
129129
return ser << k.m_addr << k.m_key;
130130
}
131-
auto operator>>(serializer& deser, parsec::agent::runner::storage_key& k)
132-
-> serializer& {
131+
auto operator>>(serializer& deser,
132+
parsec::agent::runner::storage_key& k) -> serializer& {
133133
return deser >> k.m_addr >> k.m_key;
134134
}
135135

136-
auto operator>>(serializer& deser,
137-
parsec::agent::runner::evm_pretend_block& b)
138-
-> serializer& {
136+
auto
137+
operator>>(serializer& deser,
138+
parsec::agent::runner::evm_pretend_block& b) -> serializer& {
139139
return deser >> b.m_ticket_number >> b.m_transactions;
140140
}
141141
auto operator<<(serializer& ser,
@@ -149,9 +149,9 @@ namespace cbdc {
149149
return deser >> lq.m_addresses >> lq.m_from_block >> lq.m_to_block
150150
>> lq.m_topics;
151151
}
152-
auto operator<<(serializer& ser,
153-
const parsec::agent::runner::evm_log_query& lq)
154-
-> serializer& {
152+
auto
153+
operator<<(serializer& ser,
154+
const parsec::agent::runner::evm_log_query& lq) -> serializer& {
155155
return ser << lq.m_addresses << lq.m_from_block << lq.m_to_block
156156
<< lq.m_topics;
157157
}

0 commit comments

Comments
 (0)