RPC paymentrequestvotelist and proposalvotelist change (#380)

* RPC paymentrequestvotelist and proposalvotelist change

- Change output to show JSON instead of string

* Update proposalvotelist test

* Update paymentrequestvotelist test

* Fix typo

Author: alex v

qa/rpc-tests/cfund-paymentrequestvotelist.py

@@ -65,9 +65,9 @@ def run_test(self):
         assert(len(self.nodes[0].paymentrequestvotelist()["null"]) == 1)
 
         # Verify the hashes are contained in the output vote list
-        assert("hash=" + preqid0_a in self.nodes[0].paymentrequestvotelist()["yes"][0])
-        assert("hash=" + preqid0_b in self.nodes[0].paymentrequestvotelist()["no"][0])
-        assert("hash=" + preqid1_c in self.nodes[0].paymentrequestvotelist()["null"][0])
+        assert(preqid0_a == self.nodes[0].paymentrequestvotelist()["yes"][0]["hash"])
+        assert(preqid0_b == self.nodes[0].paymentrequestvotelist()["no"][0]["hash"])
+        assert(preqid1_c == self.nodes[0].paymentrequestvotelist()["null"][0]["hash"])
 
         # Revote differently
         self.nodes[0].paymentrequestvote(preqid0_a, "no")
@@ -86,7 +86,7 @@ def run_test(self):
 
         # Check the new payment request has been added to "null" of payment request vote list
         assert(len(self.nodes[0].paymentrequestvotelist()["null"]) == 1)
-        assert("hash=" + preq0_d in self.nodes[0].paymentrequestvotelist()["null"][0])
+        assert(preq0_d == self.nodes[0].paymentrequestvotelist()["null"][0]["hash"])
 
 
 if __name__ == '__main__':

qa/rpc-tests/cfund-proposalvotelist.py

@@ -55,9 +55,9 @@ def run_test(self):
         assert(len(self.nodes[0].proposalvotelist()["null"]) == 1)
 
         # Verify the hashes are contained in the output vote list
-        assert("hash=" + proposalid0 in self.nodes[0].proposalvotelist()["yes"][0])
-        assert("hash=" + proposalid1 in self.nodes[0].proposalvotelist()["no"][0])
-        assert("hash=" + proposalid2 in self.nodes[0].proposalvotelist()["null"][0])
+        assert(proposalid0 == self.nodes[0].proposalvotelist()["yes"][0]["hash"])
+        assert(proposalid1 == self.nodes[0].proposalvotelist()["no"][0]["hash"])
+        assert(proposalid2 == self.nodes[0].proposalvotelist()["null"][0]["hash"])
 
         # Revote differently
         self.nodes[0].proposalvote(proposalid0, "no")
@@ -76,7 +76,7 @@ def run_test(self):
 
         # Check the new proposal has been added to "null" of proposal vote list
         assert(len(self.nodes[0].proposalvotelist()["null"]) == 1)
-        assert("hash=" + proposalid3 in self.nodes[0].proposalvotelist()["null"][0])
+        assert(proposalid3 == self.nodes[0].proposalvotelist()["null"][0]["hash"])
 
 
 if __name__ == '__main__':

src/wallet/rpcwallet.cpp

@@ -3363,13 +3363,15 @@ UniValue proposalvotelist(const UniValue& params, bool fHelp)
                  continue;
              auto it = std::find_if( vAddedProposalVotes.begin(), vAddedProposalVotes.end(),
                  [&proposal](const std::pair<std::string, bool>& element){ return element.first == proposal.hash.ToString();} );
+             UniValue p(UniValue::VOBJ);
+             proposal.ToJson(p);
              if (it != vAddedProposalVotes.end()) {
                  if (it->second)
-                     yesvotes.push_back(proposal.ToString());
+                     yesvotes.push_back(p);
                  else
-                     novotes.push_back(proposal.ToString());
+                     novotes.push_back(p);
              } else {
-                 nullvotes.push_back(proposal.ToString());
+                 nullvotes.push_back(p);
              }
          }
      }
@@ -3461,13 +3463,15 @@ UniValue paymentrequestvotelist(const UniValue& params, bool fHelp)
                  continue;
              auto it = std::find_if( vAddedPaymentRequestVotes.begin(), vAddedPaymentRequestVotes.end(),
                  [&prequest](const std::pair<std::string, bool>& element){ return element.first == prequest.hash.ToString();} );
+             UniValue p(UniValue::VOBJ);
+             prequest.ToJson(p);
              if (it != vAddedPaymentRequestVotes.end()) {
                  if (it->second)
-                     yesvotes.push_back(prequest.ToString());
+                     yesvotes.push_back(p);
                  else
-                     novotes.push_back(prequest.ToString());
+                     novotes.push_back(p);
              } else {
-                 nullvotes.push_back(prequest.ToString());
+                 nullvotes.push_back(p);
              }
          }
      }