]> Git Repo - VerusCoin.git/commitdiff
Auto merge of #2456 - btccom:master, r=str4d
authorHomu <[email protected]>
Tue, 20 Jun 2017 08:15:15 +0000 (01:15 -0700)
committerHomu <[email protected]>
Tue, 20 Jun 2017 08:15:15 +0000 (01:15 -0700)
[mining] let "getblocktemplate" work when disable wallet

we already support GetBlockTemplate without build wallet, see:

https://github.com/zcash/zcash/blob/master/src/rpcmining.cpp

```
    // Wallet or miner address is required because we support coinbasetxn
    if (GetArg("-mineraddress", "").empty()) {
#ifdef ENABLE_WALLET
        if (!pwalletMain) {
            throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Wallet disabled and -mineraddress not set");
        }
#else
        throw JSONRPCError(RPC_METHOD_NOT_FOUND, "zcashd compiled without wallet and -mineraddress not set");
#endif
    }
```

so the macro should be removed from `src/rpcserver.cpp`, otherwise you can't call `getblocktemplate` when you disable wallet.


Trivial merge
This page took 0.024478 seconds and 4 git commands to generate.