Merge #15755: rpc: remove unused var in rawtransaction.cpp

MarcoFalke · MarcoFalke · commit 35991b162fd1 · 2019-04-05T09:16:15.000-04:00
4831aec Remove unused var (Peter Bushnell) Pull request description: `UniValue result` was never used. ACKs for commit 4831ae: practicalswift: utACK 4831aec promag: utACK 4831aec. Tree-SHA512: e3120dffcb10c747842e81d53c7834dc9c10a82d63ff9c41c8b9403b01cc28fba2e1f3ec78cf8e50998e7c75b39656ab1170fc72053c1a00d68278846468c861
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1549,7 +1549,6 @@ UniValue combinepsbt(const JSONRPCRequest& request)
         throw JSONRPCTransactionError(error);
     }
 
-    UniValue result(UniValue::VOBJ);
     CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
     ssTx << merged_psbt;
     return EncodeBase64((unsigned char*)ssTx.data(), ssTx.size());

Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,6 @@ UniValue combinepsbt(const JSONRPCRequest& request)`
`1549`	`1549`	`throw JSONRPCTransactionError(error);`
`1550`	`1550`	`}`
`1551`	`1551`
`1552`		`- UniValue result(UniValue::VOBJ);`
`1553`	`1552`	`CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);`
`1554`	`1553`	`ssTx << merged_psbt;`
`1555`	`1554`	`return EncodeBase64((unsigned char*)ssTx.data(), ssTx.size());`