Handle empty string in output type parsing

promag · promag · commit 242c8bd8b91a · 2018-03-20T23:55:21.000Z
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4012,12 +4012,12 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&
         }
     }
 
-    if (!gArgs.GetArg("-addresstype", "").empty() && !ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {
+    if (!ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {
         InitError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", "")));
         return nullptr;
     }
 
-    if (!gArgs.GetArg("-changetype", "").empty() && !ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {
+    if (!ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {
         InitError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", "")));
         return nullptr;
     }
@@ -4207,7 +4207,9 @@ static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32";
 
 bool ParseOutputType(const std::string& type, OutputType& output_type)
 {
-    if (type == OUTPUT_TYPE_STRING_LEGACY) {
+    if (type.empty()) {
+        return true;
+    } else if (type == OUTPUT_TYPE_STRING_LEGACY) {
         output_type = OutputType::LEGACY;
         return true;
     } else if (type == OUTPUT_TYPE_STRING_P2SH_SEGWIT) {
diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py
@@ -224,7 +224,10 @@ def run_test(self):
         outputs = { self.nodes[0].getnewaddress() : Decimal(4.0) }
         rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
         assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[2].fundrawtransaction, rawtx, {'change_type': None})
-        assert_raises_rpc_error(-5, "Unknown change type ''", self.nodes[2].fundrawtransaction, rawtx, {'change_type': ''})
+        rawtx = self.nodes[2].fundrawtransaction(rawtx, {'change_type': ''})
+        dec_tx = self.nodes[2].decoderawtransaction(rawtx['hex'])
+        assert_equal('scripthash', dec_tx['vout'][rawtx['changepos']]['scriptPubKey']['type'])
+        rawtx   = self.nodes[2].createrawtransaction(inputs, outputs)
         rawtx = self.nodes[2].fundrawtransaction(rawtx, {'change_type': 'bech32'})
         dec_tx = self.nodes[2].decoderawtransaction(rawtx['hex'])
         assert_equal('witness_v0_keyhash', dec_tx['vout'][rawtx['changepos']]['scriptPubKey']['type'])
diff --git a/test/functional/wallet_address_types.py b/test/functional/wallet_address_types.py
@@ -280,10 +280,12 @@ def run_test(self):
         self.log.info('getrawchangeaddress defaults to addresstype if -changetype is not set and argument is absent')
         self.test_address(3, self.nodes[3].getrawchangeaddress(), multisig=False, typ='bech32')
 
+        self.log.info('test empty address type arguments')
+        self.nodes[3].addmultisigaddress(2, [compressed_1, compressed_2], None, '')
+        self.nodes[3].getnewaddress(None, '')
+        self.nodes[3].getrawchangeaddress('')
+
         self.log.info('test invalid address type arguments')
-        assert_raises_rpc_error(-5, "Unknown address type ''", self.nodes[3].addmultisigaddress, 2, [compressed_1, compressed_2], None, '')
-        assert_raises_rpc_error(-5, "Unknown address type ''", self.nodes[3].getnewaddress, None, '')
-        assert_raises_rpc_error(-5, "Unknown address type ''", self.nodes[3].getrawchangeaddress, '')
         assert_raises_rpc_error(-5, "Unknown address type 'bech23'", self.nodes[3].getrawchangeaddress, 'bech23')
 
         self.log.info("Nodes with changetype=p2sh-segwit never use a P2WPKH change output")

Original file line number	Diff line number	Diff line change
`@@ -4012,12 +4012,12 @@ CWallet* CWallet::CreateWalletFromFile(const std::string& name, const fs::path&`
`4012`	`4012`	`}`
`4013`	`4013`	`}`
`4014`	`4014`
`4015`		`- if (!gArgs.GetArg("-addresstype", "").empty() && !ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {`
	`4015`	`+ if (!ParseOutputType(gArgs.GetArg("-addresstype", ""), walletInstance->m_default_address_type)) {`
`4016`	`4016`	`InitError(strprintf("Unknown address type '%s'", gArgs.GetArg("-addresstype", "")));`
`4017`	`4017`	`return nullptr;`
`4018`	`4018`	`}`
`4019`	`4019`
`4020`		`- if (!gArgs.GetArg("-changetype", "").empty() && !ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {`
	`4020`	`+ if (!ParseOutputType(gArgs.GetArg("-changetype", ""), walletInstance->m_default_change_type)) {`
`4021`	`4021`	`InitError(strprintf("Unknown change type '%s'", gArgs.GetArg("-changetype", "")));`
`4022`	`4022`	`return nullptr;`
`4023`	`4023`	`}`
`@@ -4207,7 +4207,9 @@ static const std::string OUTPUT_TYPE_STRING_BECH32 = "bech32";`
`4207`	`4207`
`4208`	`4208`	`bool ParseOutputType(const std::string& type, OutputType& output_type)`
`4209`	`4209`	`{`
`4210`		`- if (type == OUTPUT_TYPE_STRING_LEGACY) {`
	`4210`	`+ if (type.empty()) {`
	`4211`	`+ return true;`
	`4212`	`+ } else if (type == OUTPUT_TYPE_STRING_LEGACY) {`
`4211`	`4213`	`output_type = OutputType::LEGACY;`
`4212`	`4214`	`return true;`
`4213`	`4215`	`} else if (type == OUTPUT_TYPE_STRING_P2SH_SEGWIT) {`