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

[Wallet] Add parameter interaction between -disablewallet and -staking #180

Merged
merged 1 commit into from
May 11, 2017
Merged

[Wallet] Add parameter interaction between -disablewallet and -staking #180

merged 1 commit into from
May 11, 2017

Conversation

aaronm-cloudtek
Copy link

As title

See #158

@Mrs-X
Copy link

Mrs-X commented May 7, 2017

Concept ACK with a little Nit, the same #ifdef exists already here:
https://github.com/PIVX-Project/PIVX/blob/master/src/init.cpp#L757-L759
so I'd move yours down there, e.g.:

    setvbuf(stdout, NULL, _IOLBF, 0); /// ***TODO*** do we still need this after -printtoconsole is gone?

    // Staking needs a CWallet instance, so make sure wallet is enabled
#ifdef ENABLE_WALLET
    bool fDisableWallet = GetBoolArg("-disablewallet", false);
    if (fDisableWallet) {
#endif
        if (SoftSetBoolArg("-staking", false))
            LogPrintf("AppInit2 : parameter interaction: wallet functionality not enabled -> setting -staking=0\n");
#ifdef ENABLE_WALLET
    }
#endif

    nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);

@aaronm-cloudtek
Copy link
Author

Thanks, PR updated

@Mrs-X
Copy link

Mrs-X commented May 8, 2017

utACK 43899e1

@Fuzzbawls Fuzzbawls added this to the Future milestone May 11, 2017
@Mrs-X Mrs-X merged commit 43899e1 into PIVX-Project:master May 11, 2017
Mrs-X added a commit that referenced this pull request May 11, 2017
… and -staking

43899e1 [Wallet] Add parameter interaction between -disablewallet and -staking (Aaron Miller)

Tree-SHA512: a190c4be12a32ea718bd0493f53ae210bb083fe1ac9387641cb48daa758608f7109b63bb5073637661c80f2e81a3afef44878c8fea9ad779860dbe692f58d473
@Fuzzbawls Fuzzbawls modified the milestones: Future, v2.3.0 Jul 8, 2017
@aaronm-cloudtek aaronm-cloudtek deleted the disablewallet-staking-parameter-interaction branch July 28, 2017 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants