Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polish BSIP40 with latest change requests #2203

Open
wants to merge 10 commits into
base: release
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/fc
20 changes: 7 additions & 13 deletions libraries/protocol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,18 @@ list(APPEND CUSTOM_AUTHS_FILES
custom_authorities/create_predicate_fwd_1.cpp
custom_authorities/create_predicate_fwd_2.cpp
custom_authorities/create_predicate_fwd_3.cpp
custom_authorities/restriction_predicate.cpp
custom_authorities/list_1.cpp
custom_authorities/list_2.cpp
custom_authorities/list_3.cpp
custom_authorities/list_4.cpp
custom_authorities/list_5.cpp
custom_authorities/list_6.cpp
custom_authorities/list_7.cpp
custom_authorities/list_8.cpp
custom_authorities/list_9.cpp
custom_authorities/list_10.cpp
custom_authorities/list_11.cpp
custom_authorities/list_12.cpp)
custom_authorities/restriction_predicate.cpp)

foreach(LIST_NUM RANGE 1 12)
configure_file("custom_authorities/list.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/custom_authorities/list_${LIST_NUM}.cpp")
list(APPEND CUSTOM_AUTHS_FILES "${CMAKE_CURRENT_BINARY_DIR}/custom_authorities/list_${LIST_NUM}.cpp")
endforeach(LIST_NUM)

file(GLOB CUSTOM_AUTHS_HEADERS "custom_authorities/*.hxx")

add_library( graphene_protocol_custom_auths ${CUSTOM_AUTHS_FILES} ${CUSTOM_AUTHS_HEADERS} )
target_link_libraries( graphene_protocol_custom_auths fc )
target_include_directories(graphene_protocol_custom_auths PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/custom_authorities")
target_include_directories( graphene_protocol_custom_auths PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )

if( MSVC )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
namespace graphene { namespace protocol {
using result_type = object_restriction_predicate<operation>;

result_type get_restriction_predicate_list_1(size_t idx, vector<restriction> rs) {
return typelist::runtime::dispatch(operation_list_1::list(), idx, [&rs] (auto t) -> result_type {
result_type get_restriction_predicate_list_${LIST_NUM}(size_t idx, vector<restriction> rs) {
return typelist::runtime::dispatch(operation_list_${LIST_NUM}::list(), idx, [&rs] (auto t) -> result_type {
using Op = typename decltype(t)::type;
return [p=restrictions_to_predicate<Op>(std::move(rs), true)] (const operation& op) {
FC_ASSERT(op.which() == operation::tag<Op>::value,
Expand Down
41 changes: 0 additions & 41 deletions libraries/protocol/custom_authorities/list_10.cpp

This file was deleted.

41 changes: 0 additions & 41 deletions libraries/protocol/custom_authorities/list_11.cpp

This file was deleted.

41 changes: 0 additions & 41 deletions libraries/protocol/custom_authorities/list_12.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/protocol/custom_authorities/list_2.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/protocol/custom_authorities/list_3.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/protocol/custom_authorities/list_4.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/protocol/custom_authorities/list_5.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libraries/protocol/custom_authorities/list_6.cpp

This file was deleted.

Loading