Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Remove wallet unlock unlock-timeout option #4139

Merged
merged 1 commit into from
Jun 15, 2018
Merged

Remove wallet unlock unlock-timeout option #4139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions programs/cleos/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ FC_DECLARE_EXCEPTION( localized_exception, 10000000, "an error occured" );

string url = "http://localhost:8888/";
string wallet_url = "http://localhost:8900/";
int64_t wallet_unlock_timeout = 0;
bool no_verify = false;
vector<string> headers;

Expand Down Expand Up @@ -745,9 +744,6 @@ void ensure_keosd_running(CLI::App* app) {

vector<std::string> pargs;
pargs.push_back("--http-server-address=" + lo_address + ":" + std::to_string(resolved_url.resolved_port));
if (wallet_unlock_timeout > 0) {
pargs.push_back("--unlock-timeout=" + fc::to_string(wallet_unlock_timeout));
}

::boost::process::child keos(binPath, pargs,
bp::std_in.close(),
Expand Down Expand Up @@ -2183,7 +2179,6 @@ int main( int argc, char** argv ) {
auto unlockWallet = wallet->add_subcommand("unlock", localized("Unlock wallet"), false);
unlockWallet->add_option("-n,--name", wallet_name, localized("The name of the wallet to unlock"));
unlockWallet->add_option("--password", wallet_pw, localized("The password returned by wallet create"));
unlockWallet->add_option( "--unlock-timeout", wallet_unlock_timeout, localized("The timeout for unlocked wallet in seconds"));
unlockWallet->set_callback([&wallet_name, &wallet_pw] {
if( wallet_pw.size() == 0 ) {
std::cout << localized("password: ");
Expand Down