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.

Sign up for GitHub

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

remove custom operation plugin check from custom api creation #2033

Merged
merged 3 commits into from
Oct 29, 2019
Merged

remove custom operation plugin check from custom api creation #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1ab903
remove check
oxarbitrage Oct 25, 2019
860fe96
add try-catch to wallet for custom_operations plugin api
oxarbitrage Oct 25, 2019
f6738ec
add try to get_account_storage, edit wlog
oxarbitrage Oct 25, 2019
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
4 changes: 2 additions & 2 deletions libraries/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,9 +1905,9 @@ signed_transaction wallet_api::account_store_map(string account, string catalog,
}

vector<account_storage_object> wallet_api::get_account_storage(string account, string catalog)
{
{ try {
return my->_custom_operations->get_storage_info(account, catalog);
}
} FC_CAPTURE_AND_RETHROW( (account)(catalog) ) }

signed_block_with_info::signed_block_with_info( const signed_block& block )
: signed_block( block )
Expand Down
10 changes: 8 additions & 2 deletions libraries/wallet/wallet_api_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,15 @@ namespace graphene { namespace wallet { namespace detail {
_remote_api(rapi),
_remote_db(rapi->database()),
_remote_net_broadcast(rapi->network_broadcast()),
_remote_hist(rapi->history()),
_custom_operations(rapi->custom())
_remote_hist(rapi->history())
{
try {
_custom_operations = rapi->custom();
}
catch(const fc::exception& e)
{
wlog("Custom operations API is not active on server.");
}
chain_id_type remote_chain_id = _remote_db->get_chain_id();
if( remote_chain_id != _chain_id )
{
Expand Down