Skip to content

Commit 648a5a2

Browse files
SpyCheeseSpyCheese
committed
Add default implementations for some callbacks
1 parent 8bd719d commit 648a5a2

File tree

5 files changed

+43
-107
lines changed

5 files changed

+43
-107
lines changed

‎adnl/adnl.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ class Adnl : public AdnlSenderInterface {
6666
public:
6767
class Callback {
6868
public:
69-
virtual void receive_message(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data) = 0;
69+
virtual void receive_message(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data) {
70+
}
7071
virtual void receive_query(AdnlNodeIdShort src, AdnlNodeIdShort dst, td::BufferSlice data,
71-
td::Promise<td::BufferSlice> promise) = 0;
72+
td::Promise<td::BufferSlice> promise) {
73+
}
7274
virtual ~Callback() = default;
7375
};
7476

‎create-hardfork/create-hardfork.cpp‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -234,49 +234,6 @@ class HardforkCreator : public td::actor::Actor {
234234
td::actor::send_closure(id_, &ton::validator::ValidatorManager::sync_complete,
235235
td::PromiseCreator::lambda([](td::Unit) {}));
236236
}
237-
void on_new_masterchain_block(td::Ref<ton::validator::MasterchainState> state,
238-
std::set<ton::ShardIdFull> shards_to_monitor) override {
239-
}
240-
void send_ihr_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
241-
}
242-
void send_ext_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
243-
}
244-
void send_shard_block_info(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::BufferSlice data) override {
245-
}
246-
void send_block_candidate(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::uint32 validator_set_hash,
247-
td::BufferSlice data, int mode) override {
248-
}
249-
void send_broadcast(ton::BlockBroadcast broadcast, int mode) override {
250-
}
251-
void download_block(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
252-
td::Promise<ton::ReceivedBlock> promise) override {
253-
}
254-
void download_zero_state(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
255-
td::Promise<td::BufferSlice> promise) override {
256-
}
257-
void download_persistent_state(ton::BlockIdExt block_id, ton::BlockIdExt masterchain_block_id,
258-
ton::validator::PersistentStateType type, td::uint32 priority,
259-
td::Timestamp timeout, td::Promise<td::BufferSlice> promise) override {
260-
}
261-
void download_block_proof(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
262-
td::Promise<td::BufferSlice> promise) override {
263-
}
264-
void download_block_proof_link(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
265-
td::Promise<td::BufferSlice> promise) override {
266-
}
267-
void get_next_key_blocks(ton::BlockIdExt block_id, td::Timestamp timeout,
268-
td::Promise<std::vector<ton::BlockIdExt>> promise) override {
269-
}
270-
void download_archive(ton::BlockSeqno masterchain_seqno, ton::ShardIdFull shard_prefix, std::string tmp_dir,
271-
td::Timestamp timeout, td::Promise<std::string> promise) override {
272-
}
273-
void download_out_msg_queue_proof(
274-
ton::ShardIdFull dst_shard, std::vector<ton::BlockIdExt> blocks, block::ImportedMsgQueueLimits limits,
275-
td::Timestamp timeout, td::Promise<std::vector<td::Ref<ton::validator::OutMsgQueueProof>>> promise) override {
276-
}
277-
278-
void new_key_block(ton::validator::BlockHandle handle) override {
279-
}
280237
};
281238

282239
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManagerInterface::install_callback,

‎overlay/overlays.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,13 @@ class Overlays : public td::actor::Actor {
275275
public:
276276
class Callback {
277277
public:
278-
virtual void receive_message(adnl::AdnlNodeIdShort src, OverlayIdShort overlay_id, td::BufferSlice data) = 0;
278+
virtual void receive_message(adnl::AdnlNodeIdShort src, OverlayIdShort overlay_id, td::BufferSlice data) {
279+
}
279280
virtual void receive_query(adnl::AdnlNodeIdShort src, OverlayIdShort overlay_id, td::BufferSlice data,
280-
td::Promise<td::BufferSlice> promise) = 0;
281-
virtual void receive_broadcast(PublicKeyHash src, OverlayIdShort overlay_id, td::BufferSlice data) = 0;
281+
td::Promise<td::BufferSlice> promise) {
282+
}
283+
virtual void receive_broadcast(PublicKeyHash src, OverlayIdShort overlay_id, td::BufferSlice data) {
284+
}
282285
virtual void check_broadcast(PublicKeyHash src, OverlayIdShort overlay_id, td::BufferSlice data,
283286
td::Promise<td::Unit> promise) {
284287
promise.set_value(td::Unit());

‎test/test-ton-collator.cpp‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,6 @@ class TestNode : public td::actor::Actor {
317317
td::actor::send_closure(id_, &ton::validator::ValidatorManager::sync_complete,
318318
td::PromiseCreator::lambda([](td::Unit) {}));
319319
}
320-
void on_new_masterchain_block(td::Ref<ton::validator::MasterchainState> state,
321-
std::set<ton::ShardIdFull> shards_to_monitor) override {
322-
}
323-
void send_ihr_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
324-
}
325-
void send_ext_message(ton::AccountIdPrefixFull dst, td::BufferSlice data) override {
326-
}
327320
void send_shard_block_info(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::BufferSlice data) override {
328321
++tdescr_cnt_;
329322
if (!tdescr_save_) {
@@ -340,40 +333,6 @@ class TestNode : public td::actor::Actor {
340333
}
341334
}
342335
}
343-
void send_block_candidate(ton::BlockIdExt block_id, ton::CatchainSeqno cc_seqno, td::uint32 validator_set_hash,
344-
td::BufferSlice data, int mode) override {
345-
}
346-
void send_broadcast(ton::BlockBroadcast broadcast, int mode) override {
347-
}
348-
void download_block(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
349-
td::Promise<ton::ReceivedBlock> promise) override {
350-
}
351-
void download_zero_state(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
352-
td::Promise<td::BufferSlice> promise) override {
353-
}
354-
void download_persistent_state(ton::BlockIdExt block_id, ton::BlockIdExt masterchain_block_id,
355-
ton::validator::PersistentStateType type, td::uint32 priority,
356-
td::Timestamp timeout, td::Promise<td::BufferSlice> promise) override {
357-
}
358-
void download_block_proof(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
359-
td::Promise<td::BufferSlice> promise) override {
360-
}
361-
void download_block_proof_link(ton::BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
362-
td::Promise<td::BufferSlice> promise) override {
363-
}
364-
void get_next_key_blocks(ton::BlockIdExt block_id, td::Timestamp timeout,
365-
td::Promise<std::vector<ton::BlockIdExt>> promise) override {
366-
}
367-
void download_archive(ton::BlockSeqno masterchain_seqno, ton::ShardIdFull shard_prefix, std::string tmp_dir,
368-
td::Timestamp timeout, td::Promise<std::string> promise) override {
369-
}
370-
void download_out_msg_queue_proof(
371-
ton::ShardIdFull dst_shard, std::vector<ton::BlockIdExt> blocks, block::ImportedMsgQueueLimits limits,
372-
td::Timestamp timeout, td::Promise<std::vector<td::Ref<ton::validator::OutMsgQueueProof>>> promise) override {
373-
}
374-
375-
void new_key_block(ton::validator::BlockHandle handle) override {
376-
}
377336
};
378337

379338
td::actor::send_closure(validator_manager_, &ton::validator::ValidatorManagerInterface::install_callback,

‎validator/validator.h‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -202,39 +202,54 @@ class ValidatorManagerInterface : public td::actor::Actor {
202202
public:
203203
virtual ~Callback() = default;
204204

205-
virtual void initial_read_complete(BlockHandle top_masterchain_blocks) = 0;
205+
virtual void initial_read_complete(BlockHandle top_masterchain_blocks) {
206+
}
206207
virtual void on_new_masterchain_block(td::Ref<ton::validator::MasterchainState> state,
207-
std::set<ShardIdFull> shards_to_monitor) = 0;
208+
std::set<ShardIdFull> shards_to_monitor) {
209+
}
208210

209-
virtual void send_ihr_message(AccountIdPrefixFull dst, td::BufferSlice data) = 0;
210-
virtual void send_ext_message(AccountIdPrefixFull dst, td::BufferSlice data) = 0;
211-
virtual void send_shard_block_info(BlockIdExt block_id, CatchainSeqno cc_seqno, td::BufferSlice data) = 0;
211+
virtual void send_ihr_message(AccountIdPrefixFull dst, td::BufferSlice data) {
212+
}
213+
virtual void send_ext_message(AccountIdPrefixFull dst, td::BufferSlice data) {
214+
}
215+
virtual void send_shard_block_info(BlockIdExt block_id, CatchainSeqno cc_seqno, td::BufferSlice data) {
216+
}
212217
virtual void send_block_candidate(BlockIdExt block_id, CatchainSeqno cc_seqno, td::uint32 validator_set_hash,
213-
td::BufferSlice data, int mode) = 0;
214-
virtual void send_broadcast(BlockBroadcast broadcast, int mode) = 0;
218+
td::BufferSlice data, int mode) {
219+
}
220+
virtual void send_broadcast(BlockBroadcast broadcast, int mode) {
221+
}
215222
virtual void send_out_msg_queue_proof_broadcast(td::Ref<OutMsgQueueProofBroadcast> broadcats) {
216-
LOG(ERROR) << "Unimplemented send_out_msg_queue_proof_broadcast - ignore broadcast";
217223
}
218224
virtual void download_block(BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
219-
td::Promise<ReceivedBlock> promise) = 0;
225+
td::Promise<ReceivedBlock> promise) {
226+
}
220227
virtual void download_zero_state(BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
221-
td::Promise<td::BufferSlice> promise) = 0;
228+
td::Promise<td::BufferSlice> promise) {
229+
}
222230
virtual void download_persistent_state(BlockIdExt block_id, BlockIdExt masterchain_block_id,
223231
PersistentStateType type, td::uint32 priority, td::Timestamp timeout,
224-
td::Promise<td::BufferSlice> promise) = 0;
232+
td::Promise<td::BufferSlice> promise) {
233+
}
225234
virtual void download_block_proof(BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
226-
td::Promise<td::BufferSlice> promise) = 0;
235+
td::Promise<td::BufferSlice> promise) {
236+
}
227237
virtual void download_block_proof_link(BlockIdExt block_id, td::uint32 priority, td::Timestamp timeout,
228-
td::Promise<td::BufferSlice> promise) = 0;
238+
td::Promise<td::BufferSlice> promise) {
239+
240+
}
229241
virtual void get_next_key_blocks(BlockIdExt block_id, td::Timestamp timeout,
230-
td::Promise<std::vector<BlockIdExt>> promise) = 0;
242+
td::Promise<std::vector<BlockIdExt>> promise) {
243+
}
231244
virtual void download_archive(BlockSeqno masterchain_seqno, ShardIdFull shard_prefix, std::string tmp_dir,
232-
td::Timestamp timeout, td::Promise<std::string> promise) = 0;
245+
td::Timestamp timeout, td::Promise<std::string> promise) {
246+
}
233247
virtual void download_out_msg_queue_proof(ShardIdFull dst_shard, std::vector<BlockIdExt> blocks,
234248
block::ImportedMsgQueueLimits limits, td::Timestamp timeout,
235-
td::Promise<std::vector<td::Ref<OutMsgQueueProof>>> promise) = 0;
236-
237-
virtual void new_key_block(BlockHandle handle) = 0;
249+
td::Promise<std::vector<td::Ref<OutMsgQueueProof>>> promise) {
250+
}
251+
virtual void new_key_block(BlockHandle handle) {
252+
}
238253
};
239254

240255
virtual ~ValidatorManagerInterface() = default;

0 commit comments

Comments
 (0)