Skip to content

Commit 43629e6

Browse files
authored
Merge pull request #1662 from AntelopeIO/gh_1621
[2.0.0-dev] Remove deprecated functions.
2 parents f6a1961 + f96340c commit 43629e6

4 files changed

Lines changed: 0 additions & 57 deletions

File tree

libraries/chain/abi_serializer.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ namespace eosio::chain {
7474
set_abi(std::move(abi), yield);
7575
}
7676

77-
abi_serializer::abi_serializer( const abi_def& abi, const fc::microseconds& max_serialization_time) {
78-
configure_built_in_types();
79-
set_abi(abi, create_yield_function(max_serialization_time));
80-
}
81-
8277
void abi_serializer::add_specialized_unpack_pack( const string& name,
8378
std::pair<abi_serializer::unpack_function, abi_serializer::pack_function> unpack_pack ) {
8479
built_in_types[name] = std::move( unpack_pack );
@@ -192,10 +187,6 @@ namespace eosio::chain {
192187
validate(ctx);
193188
}
194189

195-
void abi_serializer::set_abi(const abi_def& abi, const fc::microseconds& max_serialization_time) {
196-
return set_abi(abi, create_yield_function(max_serialization_time));
197-
}
198-
199190
bool abi_serializer::is_builtin_type(const std::string_view& type)const {
200191
return built_in_types.find(type) != built_in_types.end();
201192
}

libraries/chain/controller.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5506,38 +5506,13 @@ block_handle controller::head()const {
55065506
return my->chain_head;
55075507
}
55085508

5509-
uint32_t controller::head_block_num()const {
5510-
return my->chain_head.block_num();
5511-
}
5512-
block_timestamp_type controller::head_block_timestamp()const {
5513-
return my->chain_head.block_time();
5514-
}
5515-
time_point controller::head_block_time()const {
5516-
return my->chain_head.block_time();
5517-
}
5518-
block_id_type controller::head_block_id()const {
5519-
return my->chain_head.id();
5520-
}
5521-
5522-
account_name controller::head_block_producer()const {
5523-
return my->chain_head.producer();
5524-
}
5525-
5526-
const block_header& controller::head_block_header()const {
5527-
return my->chain_head.header();
5528-
}
5529-
55305509
block_state_legacy_ptr controller::head_block_state_legacy()const {
55315510
// returns null after instant finality activated
55325511
return block_handle_accessor::apply_l<block_state_legacy_ptr>(my->chain_head, [](const auto& head) {
55335512
return head;
55345513
});
55355514
}
55365515

5537-
const signed_block_ptr& controller::head_block()const {
5538-
return my->chain_head.block();
5539-
}
5540-
55415516
std::optional<finality_data_t> controller::head_finality_data() const {
55425517
return my->head_finality_data();
55435518
}
@@ -5546,14 +5521,6 @@ block_handle controller::fork_db_head()const {
55465521
return my->fork_db_head();
55475522
}
55485523

5549-
uint32_t controller::fork_db_head_block_num()const {
5550-
return my->fork_db_head_block_num();
5551-
}
5552-
5553-
block_id_type controller::fork_db_head_block_id()const {
5554-
return my->fork_db_head_block_id();
5555-
}
5556-
55575524
block_timestamp_type controller::pending_block_timestamp()const {
55585525
return my->pending_block_timestamp();
55595526
}

libraries/chain/include/eosio/chain/abi_serializer.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ struct abi_serializer {
4747

4848
abi_serializer(){ configure_built_in_types(); }
4949
abi_serializer( abi_def abi, const yield_function_t& yield );
50-
[[deprecated("use the overload with yield_function_t[=create_yield_function(max_serialization_time)]")]]
51-
abi_serializer( const abi_def& abi, const fc::microseconds& max_serialization_time );
5250
void set_abi( abi_def abi, const yield_function_t& yield );
53-
[[deprecated("use the overload with yield_function_t[=create_yield_function(max_serialization_time)]")]]
54-
void set_abi(const abi_def& abi, const fc::microseconds& max_serialization_time);
5551

5652
/// @return string_view of `t` or internal string type
5753
std::string_view resolve_type(const std::string_view& t)const;

libraries/chain/include/eosio/chain/controller.hpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -287,23 +287,12 @@ namespace eosio::chain {
287287
block_handle head()const;
288288
block_handle fork_db_head()const;
289289

290-
[[deprecated("Use head().block_num().")]] uint32_t head_block_num()const;
291-
[[deprecated("Use head().block_time().")]] time_point head_block_time()const;
292-
[[deprecated("Use head().timestamp().")]] block_timestamp_type head_block_timestamp()const;
293-
[[deprecated("Use head().id().")]] block_id_type head_block_id()const;
294-
[[deprecated("Use head().producer().")]] account_name head_block_producer()const;
295-
[[deprecated("Use head().header().")]] const block_header& head_block_header()const;
296-
[[deprecated("Use head().block().")]] const signed_block_ptr& head_block()const;
297-
298290
// returns nullptr after instant finality enabled
299291
block_state_legacy_ptr head_block_state_legacy()const;
300292
// returns finality_data associated with chain head for SHiP when in Savanna,
301293
// std::nullopt in Legacy
302294
std::optional<finality_data_t> head_finality_data() const;
303295

304-
[[deprecated("Use fork_db_head().block_num().")]] uint32_t fork_db_head_block_num()const;
305-
[[deprecated("Use fork_db_head().id().")]] block_id_type fork_db_head_block_id()const;
306-
307296
time_point pending_block_time()const;
308297
block_timestamp_type pending_block_timestamp()const;
309298
account_name pending_block_producer()const;

0 commit comments

Comments
 (0)