Skip to content

Commit bf8a04a

Browse files
luke-jrluke-jr
committed
Reformat touched lines with C++11
1 parent 2e518e3 commit bf8a04a

File tree

4 files changed

+214
-132
lines changed

4 files changed

+214
-132
lines changed

‎src/rpc/misc.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ UniValue getinfo(const JSONRPCRequest& request)
101101
obj.push_back(Pair("keypoololdest", pwallet->GetOldestKeyPoolTime()));
102102
obj.push_back(Pair("keypoolsize", (int)pwallet->GetKeyPoolSize()));
103103
}
104-
if (pwallet && pwallet->IsCrypted())
104+
if (pwallet && pwallet->IsCrypted()) {
105105
obj.push_back(Pair("unlocked_until", pwallet->nRelockTime));
106+
}
106107
obj.push_back(Pair("paytxfee", ValueFromAmount(payTxFee.GetFeePerK())));
107108
#endif
108109
obj.push_back(Pair("relayfee", ValueFromAmount(::minRelayTxFee.GetFeePerK())));
@@ -210,8 +211,9 @@ UniValue validateaddress(const JSONRPCRequest& request)
210211
ret.push_back(Pair("iswatchonly", (mine & ISMINE_WATCH_ONLY) ? true: false));
211212
UniValue detail = boost::apply_visitor(DescribeAddressVisitor(pwallet), dest);
212213
ret.pushKVs(detail);
213-
if (pwallet && pwallet->mapAddressBook.count(dest))
214+
if (pwallet && pwallet->mapAddressBook.count(dest)) {
214215
ret.push_back(Pair("account", pwallet->mapAddressBook[dest].name));
216+
}
215217
CKeyID keyID;
216218
if (pwallet) {
217219
const auto& meta = pwallet->mapKeyMetadata;
@@ -257,16 +259,16 @@ CScript _createmultisig_redeemScript(CWallet * const pwallet, const UniValue& pa
257259
#ifdef ENABLE_WALLET
258260
// Case 1: Bitcoin address and we have full public key:
259261
CBitcoinAddress address(ks);
260-
if (pwallet && address.IsValid())
261-
{
262+
if (pwallet && address.IsValid()) {
262263
CKeyID keyID;
263264
if (!address.GetKeyID(keyID))
264265
throw runtime_error(
265266
strprintf("%s does not refer to a key",ks));
266267
CPubKey vchPubKey;
267-
if (!pwallet->GetPubKey(keyID, vchPubKey))
268+
if (!pwallet->GetPubKey(keyID, vchPubKey)) {
268269
throw runtime_error(
269270
strprintf("no full public key for address %s",ks));
271+
}
270272
if (!vchPubKey.IsFullyValid())
271273
throw runtime_error(" Invalid public key: "+ks);
272274
pubkeys[i] = vchPubKey;

‎src/rpc/rawtransaction.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,9 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
721721
}
722722
}
723723
#ifdef ENABLE_WALLET
724-
else if (pwallet)
724+
else if (pwallet) {
725725
EnsureWalletIsUnlocked(pwallet);
726+
}
726727
#endif
727728

728729
// Add previous txouts given in the RPC call:

‎src/wallet/rpcdump.cpp‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ UniValue importprivkey(const JSONRPCRequest& request)
7676
{
7777
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
7878

79-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
79+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
8080
return NullUniValue;
81+
}
8182

8283
if (request.fHelp || request.params.size() < 1 || request.params.size() > 3)
8384
throw runtime_error(
@@ -133,13 +134,15 @@ UniValue importprivkey(const JSONRPCRequest& request)
133134
pwallet->SetAddressBook(vchAddress, strLabel, "receive");
134135

135136
// Don't throw error in case a key is already there
136-
if (pwallet->HaveKey(vchAddress))
137+
if (pwallet->HaveKey(vchAddress)) {
137138
return NullUniValue;
139+
}
138140

139141
pwallet->mapKeyMetadata[vchAddress].nCreateTime = 1;
140142

141-
if (!pwallet->AddKeyPubKey(key, pubkey))
143+
if (!pwallet->AddKeyPubKey(key, pubkey)) {
142144
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
145+
}
143146

144147
// whenever a key is imported, we need to scan the whole chain
145148
pwallet->UpdateTimeFirstKey(1);
@@ -155,17 +158,20 @@ UniValue importprivkey(const JSONRPCRequest& request)
155158
void ImportAddress(CWallet*, const CBitcoinAddress& address, const string& strLabel);
156159
void ImportScript(CWallet * const pwallet, const CScript& script, const string& strLabel, bool isRedeemScript)
157160
{
158-
if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE)
161+
if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
159162
throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
163+
}
160164

161165
pwallet->MarkDirty();
162166

163-
if (!pwallet->HaveWatchOnly(script) && !pwallet->AddWatchOnly(script, 0 /* nCreateTime */))
167+
if (!pwallet->HaveWatchOnly(script) && !pwallet->AddWatchOnly(script, 0 /* nCreateTime */)) {
164168
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
169+
}
165170

166171
if (isRedeemScript) {
167-
if (!pwallet->HaveCScript(script) && !pwallet->AddCScript(script))
172+
if (!pwallet->HaveCScript(script) && !pwallet->AddCScript(script)) {
168173
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
174+
}
169175
ImportAddress(pwallet, CBitcoinAddress(CScriptID(script)), strLabel);
170176
} else {
171177
CTxDestination destination;
@@ -188,8 +194,9 @@ UniValue importaddress(const JSONRPCRequest& request)
188194
{
189195
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
190196

191-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
197+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
192198
return NullUniValue;
199+
}
193200

194201
if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
195202
throw runtime_error(
@@ -258,8 +265,9 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
258265
{
259266
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
260267

261-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
268+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
262269
return NullUniValue;
270+
}
263271

264272
if (request.fHelp || request.params.size() != 2)
265273
throw runtime_error(
@@ -319,8 +327,9 @@ UniValue removeprunedfunds(const JSONRPCRequest& request)
319327
{
320328
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
321329

322-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
330+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
323331
return NullUniValue;
332+
}
324333

325334
if (request.fHelp || request.params.size() != 1)
326335
throw runtime_error(
@@ -342,7 +351,7 @@ UniValue removeprunedfunds(const JSONRPCRequest& request)
342351
vHash.push_back(hash);
343352
vector<uint256> vHashOut;
344353

345-
if(pwallet->ZapSelectTx(vHash, vHashOut) != DB_LOAD_OK) {
354+
if (pwallet->ZapSelectTx(vHash, vHashOut) != DB_LOAD_OK) {
346355
throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not properly delete the transaction.");
347356
}
348357

@@ -357,8 +366,9 @@ UniValue importpubkey(const JSONRPCRequest& request)
357366
{
358367
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
359368

360-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
369+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
361370
return NullUniValue;
371+
}
362372

363373
if (request.fHelp || request.params.size() < 1 || request.params.size() > 4)
364374
throw runtime_error(
@@ -417,8 +427,9 @@ UniValue importwallet(const JSONRPCRequest& request)
417427
{
418428
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
419429

420-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
430+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
421431
return NullUniValue;
432+
}
422433

423434
if (request.fHelp || request.params.size() != 1)
424435
throw runtime_error(
@@ -525,8 +536,9 @@ UniValue dumpprivkey(const JSONRPCRequest& request)
525536
{
526537
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
527538

528-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
539+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
529540
return NullUniValue;
541+
}
530542

531543
if (request.fHelp || request.params.size() != 1)
532544
throw runtime_error(
@@ -555,8 +567,9 @@ UniValue dumpprivkey(const JSONRPCRequest& request)
555567
if (!address.GetKeyID(keyID))
556568
throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key");
557569
CKey vchSecret;
558-
if (!pwallet->GetKey(keyID, vchSecret))
570+
if (!pwallet->GetKey(keyID, vchSecret)) {
559571
throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known");
572+
}
560573
return CBitcoinSecret(vchSecret).ToString();
561574
}
562575

@@ -565,8 +578,9 @@ UniValue dumpwallet(const JSONRPCRequest& request)
565578
{
566579
CWallet * const pwallet = GetWalletForJSONRPCRequest(request);
567580

568-
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
581+
if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
569582
return NullUniValue;
583+
}
570584

571585
if (request.fHelp || request.params.size() != 1)
572586
throw runtime_error(
@@ -615,8 +629,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
615629
if (!masterKeyID.IsNull())
616630
{
617631
CKey key;
618-
if (pwallet->GetKey(masterKeyID, key))
619-
{
632+
if (pwallet->GetKey(masterKeyID, key)) {
620633
CExtKey masterKey;
621634
masterKey.SetMaster(key.begin(), key.size());
622635

0 commit comments

Comments
 (0)