Cleanup: dumpwallet never empty str check removed + duplicated line clean.

furszy · furszy · commit 25ee29bdc579 · 2020-03-04T11:22:52.000-03:00
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -470,10 +470,6 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
             } else {
                 file << "change=1";
             }
-
-            if (strAddr.empty()) // If empty, encode the address as a regular address.
-                strAddr = CBitcoinAddress(keyid).ToString();
-
             file << strprintf(" # addr=%s%s\n", strAddr, (metadata.HasKeyOrigin() ? " hdkeypath="+metadata.key_origin.pathToString() : ""));
         }
     }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2929,7 +2929,6 @@ UniValue getwalletinfo(const UniValue& params, bool fHelp)
             "  \"keypoolsize\": xxxx,               (numeric) how many new keys are pre-generated (only counts external keys)\n"
             "  \"keypoolsize_hd_internal\": xxxx,   (numeric) how many new keys are pre-generated for internal use (used for change outputs, only appears if the wallet is using this feature, otherwise external keys are used)\n"
             "  \"keypoolsize_hd_staking\": xxxx,    (numeric) how many new keys are pre-generated for staking use (used for staking contracts, only appears if the wallet is using this feature)\n"
-            "  \"unlocked_until\": ttt,             (numeric) the UNIX epoch time until which the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"unlocked_until\": ttt,                   (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
             "  \"paytxfee\": x.xxxx                       (numeric) the transaction fee configuration, set in PIV/kB\n"
             "  \"hdseedid\": \"<hash160>\"            (string, optional) the Hash160 of the HD seed (only present when HD is enabled)\n"

Original file line number	Diff line number	Diff line change
`@@ -470,10 +470,6 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)`
`470`	`470`	`} else {`
`471`	`471`	`file << "change=1";`
`472`	`472`	`}`
`473`		`-`
`474`		`- if (strAddr.empty()) // If empty, encode the address as a regular address.`
`475`		`- strAddr = CBitcoinAddress(keyid).ToString();`
`476`		`-`
`477`	`473`	`file << strprintf(" # addr=%s%s\n", strAddr, (metadata.HasKeyOrigin() ? " hdkeypath="+metadata.key_origin.pathToString() : ""));`
`478`	`474`	`}`
`479`	`475`	`}`