Skip to content

Commit 4156195

Browse files
SpyCheeseSpyCheese
committed
Reformat code
1 parent bd6dc88 commit 4156195

File tree

10 files changed

+73
-70
lines changed

10 files changed

+73
-70
lines changed

‎validator/db/archive-manager.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class ArchiveManager : public td::actor::Actor {
198198
std::map<std::pair<BlockSeqno, FileHash>, PermState> perm_states_; // Mc block seqno, hash -> state
199199

200200
void load_package(PackageId seqno);
201-
td::actor::ActorOwn<ArchiveSlice> create_archive_slice(const PackageId& id, td::uint32 shard_split_depth);
201+
td::actor::ActorOwn<ArchiveSlice> create_archive_slice(const PackageId &id, td::uint32 shard_split_depth);
202202
void delete_package(PackageId seqno, td::Promise<td::Unit> promise);
203203
void deleted_package(PackageId seqno, td::Promise<td::Unit> promise);
204204
void get_handle_cont(BlockIdExt block_id, PackageId id, td::Promise<BlockHandle> promise);

‎validator/db/archive-slice.cpp‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@
1616
1717
Copyright 2019-2020 Telegram Systems LLP
1818
*/
19-
#include "archive-slice.hpp"
19+
#include <csignal>
2020

21+
#include "common/delay.h"
2122
#include "td/actor/MultiPromise.h"
22-
#include "validator/fabric.h"
2323
#include "td/db/RocksDb.h"
24-
#include "td/utils/port/path.h"
25-
#include "common/delay.h"
26-
#include "files-async.hpp"
27-
#include "db-utils.h"
2824
#include "td/utils/PathView.h"
2925
#include "td/utils/Random.h"
26+
#include "td/utils/port/path.h"
27+
#include "validator/fabric.h"
3028

31-
#include <csignal>
29+
#include "archive-slice.hpp"
30+
#include "db-utils.h"
31+
#include "files-async.hpp"
3232

3333
namespace ton {
3434

3535
namespace validator {
3636

3737
class PackageStatistics {
38-
public:
38+
public:
3939
void record_open(uint64_t count = 1) {
4040
open_count.fetch_add(count, std::memory_order_relaxed);
4141
}
@@ -86,7 +86,7 @@ class PackageStatistics {
8686
return ss.str();
8787
}
8888

89-
private:
89+
private:
9090
std::atomic_uint64_t open_count{0};
9191
std::atomic_uint64_t close_count{0};
9292
PercentileStats read_time;
@@ -162,16 +162,20 @@ void PackageWriter::sync_now() {
162162
if (!waiters.empty()) {
163163
LOG(DEBUG) << "Writer huge transaction size = " << waiters.size();
164164
}
165-
for (auto &promise: waiters) {
165+
for (auto &promise : waiters) {
166166
promise.set_value(td::Unit{});
167167
}
168168
}
169169

170170
class PackageReader : public td::actor::Actor {
171171
public:
172172
PackageReader(std::shared_ptr<Package> package, td::uint64 offset,
173-
td::Promise<std::pair<std::string, td::BufferSlice>> promise, std::shared_ptr<PackageStatistics> statistics)
174-
: package_(std::move(package)), offset_(offset), promise_(std::move(promise)), statistics_(std::move(statistics)) {
173+
td::Promise<std::pair<std::string, td::BufferSlice>> promise,
174+
std::shared_ptr<PackageStatistics> statistics)
175+
: package_(std::move(package))
176+
, offset_(offset)
177+
, promise_(std::move(promise))
178+
, statistics_(std::move(statistics)) {
175179
}
176180
void start_up() override {
177181
auto start = td::Timestamp::now();
@@ -555,14 +559,14 @@ void ArchiveSlice::get_block_by_seqno(AccountIdPrefixFull account_id, BlockSeqno
555559
return get_block_common(
556560
account_id,
557561
[seqno](ton_api::db_lt_desc_value &w) {
558-
return seqno > static_cast<BlockSeqno>(w.last_seqno_)
559-
? 1
560-
: seqno == static_cast<BlockSeqno>(w.last_seqno_) ? 0 : -1;
562+
return seqno > static_cast<BlockSeqno>(w.last_seqno_) ? 1
563+
: seqno == static_cast<BlockSeqno>(w.last_seqno_) ? 0
564+
: -1;
561565
},
562566
[seqno](ton_api::db_lt_el_value &w) {
563-
return seqno > static_cast<BlockSeqno>(w.id_->seqno_)
564-
? 1
565-
: seqno == static_cast<BlockSeqno>(w.id_->seqno_) ? 0 : -1;
567+
return seqno > static_cast<BlockSeqno>(w.id_->seqno_) ? 1
568+
: seqno == static_cast<BlockSeqno>(w.id_->seqno_) ? 0
569+
: -1;
566570
},
567571
true, std::move(promise));
568572
}
@@ -768,7 +772,7 @@ void ArchiveSlice::do_close() {
768772
id_to_package_.clear();
769773
}
770774

771-
template<typename T>
775+
template <typename T>
772776
td::Promise<T> ArchiveSlice::begin_async_query(td::Promise<T> promise) {
773777
++active_queries_;
774778
return [SelfId = actor_id(this), promise = std::move(promise)](td::Result<T> R) mutable {
@@ -818,12 +822,11 @@ void ArchiveSlice::commit_transaction_now() {
818822
if (!waiters.empty()) {
819823
LOG(DEBUG) << "Huge transaction size = " << waiters.size();
820824
}
821-
for (auto &promise: waiters) {
825+
for (auto &promise : waiters) {
822826
promise.set_value(td::Unit{});
823827
}
824828
}
825829

826-
827830
void ArchiveSlice::set_async_mode(bool mode, td::Promise<td::Unit> promise) {
828831
async_mode_ = mode;
829832
if (!async_mode_) {
@@ -1097,7 +1100,7 @@ void ArchiveSlice::truncate(BlockSeqno masterchain_seqno, ConstBlockHandle, td::
10971100
return;
10981101
}
10991102

1100-
std::map<ShardIdFull, PackageInfo*> old_packages;
1103+
std::map<ShardIdFull, PackageInfo *> old_packages;
11011104
std::map<ShardIdFull, std::shared_ptr<Package>> new_packages;
11021105

11031106
std::string value;
@@ -1138,7 +1141,7 @@ void ArchiveSlice::truncate(BlockSeqno masterchain_seqno, ConstBlockHandle, td::
11381141
truncate_shard(masterchain_seqno, shard, package->seqno, new_packages[package->shard_prefix].get());
11391142
}
11401143

1141-
for (auto& [shard_prefix, package] : old_packages) {
1144+
for (auto &[shard_prefix, package] : old_packages) {
11421145
auto new_package = new_packages[shard_prefix];
11431146
CHECK(new_package);
11441147
package->package = new_package;

‎validator/db/rootdb.hpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "td/db/KeyValueAsync.h"
2323
#include "ton/ton-types.h"
2424

25+
#include "archive-manager.hpp"
2526
#include "celldb.hpp"
2627
#include "statedb.hpp"
2728
#include "staticfilesdb.hpp"
28-
#include "archive-manager.hpp"
2929
#include "validator.h"
3030

3131
namespace ton {
@@ -64,8 +64,7 @@ class RootDb : public Db {
6464
td::Promise<td::Ref<ShardState>> promise) override;
6565
void store_block_state_from_data(BlockHandle handle, td::Ref<BlockData> block,
6666
td::Promise<td::Ref<ShardState>> promise) override;
67-
void store_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
68-
td::Promise<td::Unit> promise) override;
67+
void store_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks, td::Promise<td::Unit> promise) override;
6968
void get_block_state(ConstBlockHandle handle, td::Promise<td::Ref<ShardState>> promise) override;
7069
void store_block_state_part(BlockId effective_block, td::Ref<vm::Cell> cell,
7170
td::Promise<td::Ref<vm::DataCell>> promise) override;
@@ -80,7 +79,7 @@ class RootDb : public Db {
8079
void store_persistent_state_file(BlockIdExt block_id, BlockIdExt masterchain_block_id, PersistentStateType type,
8180
td::BufferSlice state, td::Promise<td::Unit> promise) override;
8281
void store_persistent_state_file_gen(BlockIdExt block_id, BlockIdExt masterchain_block_id, PersistentStateType type,
83-
std::function<td::Status(td::FileFd&)> write_data,
82+
std::function<td::Status(td::FileFd &)> write_data,
8483
td::Promise<td::Unit> promise) override;
8584
void get_persistent_state_file(BlockIdExt block_id, BlockIdExt masterchain_block_id, PersistentStateType type,
8685
td::Promise<td::BufferSlice> promise) override;
@@ -142,8 +141,10 @@ class RootDb : public Db {
142141
void set_async_mode(bool mode, td::Promise<td::Unit> promise) override;
143142

144143
void run_gc(UnixTime mc_ts, UnixTime gc_ts, double archive_ttl) override;
145-
void add_persistent_state_description(td::Ref<PersistentStateDescription> desc, td::Promise<td::Unit> promise) override;
146-
void get_persistent_state_descriptions(td::Promise<std::vector<td::Ref<PersistentStateDescription>>> promise) override;
144+
void add_persistent_state_description(td::Ref<PersistentStateDescription> desc,
145+
td::Promise<td::Unit> promise) override;
146+
void get_persistent_state_descriptions(
147+
td::Promise<std::vector<td::Ref<PersistentStateDescription>>> promise) override;
147148

148149
void iterate_temp_block_handles(std::function<void(const BlockHandleInterface &)> f) override;
149150

‎validator/import-db-slice-local.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
You should have received a copy of the GNU Lesser General Public License
1515
along with TON Blockchain Library. If not, see <http://www.gnu.org/licenses/>.
1616
*/
17-
#include "import-db-slice-local.hpp"
18-
19-
#include "validator/db/fileref.hpp"
20-
#include "td/utils/overloaded.h"
21-
#include "validator/fabric.h"
22-
#include "td/actor/MultiPromise.h"
17+
#include "block/block-auto.h"
2318
#include "common/checksum.h"
24-
#include "td/utils/port/path.h"
2519
#include "downloaders/download-state.hpp"
26-
#include "block/block-auto.h"
20+
#include "td/actor/MultiPromise.h"
2721
#include "td/actor/coro_utils.h"
22+
#include "td/utils/overloaded.h"
23+
#include "td/utils/port/path.h"
24+
#include "validator/db/fileref.hpp"
2825
#include "validator/db/package.hpp"
26+
#include "validator/fabric.h"
27+
28+
#include "import-db-slice-local.hpp"
2929

3030
namespace ton {
3131

‎validator/interfaces/db.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Db : public td::actor::Actor {
5454
virtual void store_block_state_from_data(BlockHandle handle, td::Ref<BlockData> block,
5555
td::Promise<td::Ref<ShardState>> promise) = 0;
5656
virtual void store_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
57-
td::Promise<td::Unit> promise) = 0;
57+
td::Promise<td::Unit> promise) = 0;
5858
virtual void get_block_state(ConstBlockHandle handle, td::Promise<td::Ref<ShardState>> promise) = 0;
5959
virtual void store_block_state_part(BlockId effective_block, td::Ref<vm::Cell> cell,
6060
td::Promise<td::Ref<vm::DataCell>> promise) = 0;
@@ -65,7 +65,7 @@ class Db : public td::actor::Actor {
6565
td::Promise<td::Unit> promise) = 0;
6666
virtual void store_persistent_state_file_gen(BlockIdExt block_id, BlockIdExt masterchain_block_id,
6767
PersistentStateType type,
68-
std::function<td::Status(td::FileFd&)> write_data,
68+
std::function<td::Status(td::FileFd &)> write_data,
6969
td::Promise<td::Unit> promise) = 0;
7070
virtual void get_persistent_state_file(BlockIdExt block_id, BlockIdExt masterchain_block_id, PersistentStateType type,
7171
td::Promise<td::BufferSlice> promise) = 0;

‎validator/interfaces/validator-manager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ class ValidatorManager : public ValidatorManagerInterface {
233233
virtual void set_block_state_from_data(BlockHandle handle, td::Ref<BlockData> block,
234234
td::Promise<td::Ref<ShardState>> promise) = 0;
235235
virtual void set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
236-
td::Promise<td::Unit> promise) = 0;
236+
td::Promise<td::Unit> promise) = 0;
237237
virtual void get_cell_db_reader(td::Promise<std::shared_ptr<vm::CellDbReader>> promise) = 0;
238238
virtual void store_persistent_state_file(BlockIdExt block_id, BlockIdExt masterchain_block_id,
239239
PersistentStateType type, td::BufferSlice state,

‎validator/manager-disk.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ void ValidatorManagerImpl::set_block_state_from_data(BlockHandle handle, td::Ref
709709
}
710710

711711
void ValidatorManagerImpl::set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
712-
td::Promise<td::Unit> promise) {
712+
td::Promise<td::Unit> promise) {
713713
td::actor::send_closure(db_, &Db::store_block_state_from_data_bulk, std::move(blocks), std::move(promise));
714714
}
715715

‎validator/manager-disk.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ class ValidatorManagerImpl : public ValidatorManager {
155155
td::Promise<td::Ref<vm::DataCell>> promise) override;
156156
void set_block_state_from_data(BlockHandle handle, td::Ref<BlockData> block,
157157
td::Promise<td::Ref<ShardState>> promise) override;
158-
void set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
159-
td::Promise<td::Unit> promise) override;
158+
void set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks, td::Promise<td::Unit> promise) override;
160159
void get_cell_db_reader(td::Promise<std::shared_ptr<vm::CellDbReader>> promise) override;
161160
void store_persistent_state_file(BlockIdExt block_id, BlockIdExt masterchain_block_id, PersistentStateType type,
162161
td::BufferSlice state, td::Promise<td::Unit> promise) override;

‎validator/manager-hardfork.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,7 @@ class ValidatorManagerImpl : public ValidatorManager {
186186
td::Promise<td::Ref<ShardState>> promise) override {
187187
UNREACHABLE();
188188
}
189-
void set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks,
190-
td::Promise<td::Unit> promise) override {
189+
void set_block_state_from_data_bulk(std::vector<td::Ref<BlockData>> blocks, td::Promise<td::Unit> promise) override {
191190
UNREACHABLE();
192191
}
193192
void get_cell_db_reader(td::Promise<std::shared_ptr<vm::CellDbReader>> promise) override;

‎validator/manager.hpp‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,35 @@
1818
*/
1919
#pragma once
2020

21+
#include <list>
22+
#include <map>
23+
#include <queue>
24+
#include <set>
25+
26+
#include "collator-node/collator-node.hpp"
2127
#include "common/refcnt.hpp"
22-
#include "interfaces/validator-manager.h"
28+
#include "impl/candidates-buffer.hpp"
2329
#include "interfaces/db.h"
30+
#include "interfaces/validator-manager.h"
31+
#include "rldp/rldp.h"
32+
#include "rldp2/rldp.h"
2433
#include "td/actor/ActorStats.h"
2534
#include "td/actor/PromiseFuture.h"
35+
#include "td/utils/LRUCache.h"
2636
#include "td/utils/SharedSlice.h"
2737
#include "td/utils/buffer.h"
2838
#include "td/utils/port/Poll.h"
2939
#include "td/utils/port/StdStreams.h"
30-
#include "validator-group.hpp"
31-
#include "shard-client.hpp"
40+
3241
#include "manager-init.h"
33-
#include "state-serializer.hpp"
34-
#include "rldp/rldp.h"
35-
#include "rldp2/rldp.h"
36-
#include "token-manager.h"
3742
#include "queue-size-counter.hpp"
38-
#include "storage-stat-cache.hpp"
39-
#include "impl/candidates-buffer.hpp"
40-
#include "collator-node/collator-node.hpp"
41-
#include "shard-block-verifier.hpp"
4243
#include "shard-block-retainer.hpp"
43-
#include "td/utils/LRUCache.h"
44-
45-
#include <map>
46-
#include <set>
47-
#include <list>
48-
#include <queue>
44+
#include "shard-block-verifier.hpp"
45+
#include "shard-client.hpp"
46+
#include "state-serializer.hpp"
47+
#include "storage-stat-cache.hpp"
48+
#include "token-manager.h"
49+
#include "validator-group.hpp"
4950

5051
namespace ton {
5152

@@ -275,14 +276,14 @@ class ValidatorManagerImpl : public ValidatorManager {
275276
std::map<MessageId<ExtMessage>, std::unique_ptr<MessageExt<ExtMessage>>> ext_messages_;
276277
std::map<std::pair<ton::WorkchainId, ton::StdSmcAddress>, std::map<ExtMessage::Hash, MessageId<ExtMessage>>>
277278
ext_addr_messages_;
278-
void erase(const MessageId<ExtMessage>& id) {
279+
void erase(const MessageId<ExtMessage> &id) {
279280
auto it = ext_messages_.find(id);
280281
CHECK(it != ext_messages_.end());
281282
ext_addr_messages_[it->second->address()].erase(id.hash);
282283
ext_messages_.erase(it);
283284
}
284285
};
285-
std::map<int, ExtMessages> ext_msgs_; // priority -> messages
286+
std::map<int, ExtMessages> ext_msgs_; // priority -> messages
286287
std::map<ExtMessage::Hash, std::pair<int, MessageId<ExtMessage>>> ext_messages_hashes_; // hash -> priority
287288
td::Timestamp cleanup_mempool_at_;
288289
// IHR ?
@@ -681,11 +682,11 @@ class ValidatorManagerImpl : public ValidatorManager {
681682
void get_block_data_for_litequery(BlockIdExt block_id, td::Promise<td::Ref<BlockData>> promise) override;
682683
void get_block_state_for_litequery(BlockIdExt block_id, td::Promise<td::Ref<ShardState>> promise) override;
683684
void get_block_by_lt_for_litequery(AccountIdPrefixFull account, LogicalTime lt,
684-
td::Promise<ConstBlockHandle> promise) override;
685+
td::Promise<ConstBlockHandle> promise) override;
685686
void get_block_by_unix_time_for_litequery(AccountIdPrefixFull account, UnixTime ts,
686-
td::Promise<ConstBlockHandle> promise) override;
687+
td::Promise<ConstBlockHandle> promise) override;
687688
void get_block_by_seqno_for_litequery(AccountIdPrefixFull account, BlockSeqno seqno,
688-
td::Promise<ConstBlockHandle> promise) override;
689+
td::Promise<ConstBlockHandle> promise) override;
689690
void process_block_handle_for_litequery_error(BlockIdExt block_id, td::Result<BlockHandle> r_handle,
690691
td::Promise<ConstBlockHandle> promise);
691692
void process_lookup_block_for_litequery_error(AccountIdPrefixFull account, int type, td::uint64 value,
@@ -702,7 +703,7 @@ class ValidatorManagerImpl : public ValidatorManager {
702703
++(success ? total_ls_queries_ok_ : total_ls_queries_error_)[lite_query_id];
703704
}
704705

705-
void get_storage_stat_cache(td::Promise<std::function<td::Ref<vm::Cell>(const td::Bits256&)>> promise) override {
706+
void get_storage_stat_cache(td::Promise<std::function<td::Ref<vm::Cell>(const td::Bits256 &)>> promise) override {
706707
td::actor::send_closure(storage_stat_cache_, &StorageStatCache::get_cache, std::move(promise));
707708
}
708709
void update_storage_stat_cache(std::vector<std::pair<td::Ref<vm::Cell>, td::uint32>> data) override {
@@ -837,7 +838,7 @@ class ValidatorManagerImpl : public ValidatorManager {
837838

838839
td::actor::ActorOwn<StorageStatCache> storage_stat_cache_;
839840

840-
template<typename T>
841+
template <typename T>
841842
void write_session_stats(const T &obj);
842843

843844
td::actor::ActorOwn<ShardBlockVerifier> shard_block_verifier_;

0 commit comments

Comments
 (0)