Merge pull request #334 from aguycalled/cfund-rpc

Community Fund RPC commands

Author: proletesseract

qa/pull-tester/rpc-tests.py

@@ -157,6 +157,8 @@
     'cfund-rawtx-paymentrequest-vote.py',
     'cfund-rawtx-proposal-vote.py',
     'cfund-vote.py',
+    'cfund-proposalvotelist.py',
+    'cfund-paymentrequestvotelist.py',
     'reject-version-bit.py',
     'staticr-staking-amount.py',
 

qa/rpc-tests/cfund-paymentrequestvotelist.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Navcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import NavCoinTestFramework
+from test_framework.cfund_util import *
+
+import time
+
+class CommunityFundPaymentRequestVoteListTest(NavCoinTestFramework):
+    """Tests the paymentrequestvotelist function of the Community fund."""
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        self.nodes = self.setup_nodes()
+        self.is_network_split = split
+
+    def run_test(self):
+        # Make sure cfund is active
+        activate_cfund(self.nodes[0])
+        self.nodes[0].donatefund(1000)
+
+        address0 = self.nodes[0].getnewaddress()
+
+        # Set up 2 proposals
+        proposalid0 = self.nodes[0].createproposal(address0, 100, 3600, "test0")["hash"]
+        proposalid1 = self.nodes[0].createproposal(address0, 100, 3600, "test1")["hash"]
+        start_new_cycle(self.nodes[0])
+
+        # Vote yes and pass proposals
+        self.nodes[0].proposalvote(proposalid0, "yes")
+        self.nodes[0].proposalvote(proposalid1, "yes")
+        start_new_cycle(self.nodes[0])
+
+        # Preflight checks
+        assert(len(self.nodes[0].paymentrequestvotelist()["yes"]) == 0)
+        assert(len(self.nodes[0].paymentrequestvotelist()["no"]) == 0)
+        assert(len(self.nodes[0].paymentrequestvotelist()["null"]) == 0)
+
+        # Create payment requests
+        preqid0_a = self.nodes[0].createpaymentrequest(proposalid0, 1, "preq0_a")["hash"]
+        preqid0_b = self.nodes[0].createpaymentrequest(proposalid0, 1, "preq0_b")["hash"]
+        preqid1_c = self.nodes[0].createpaymentrequest(proposalid1, 10, "preq1_c")["hash"]
+        slow_gen(self.nodes[0], 1)
+
+        # Verify the payment requests are now in the payment request vote list
+        assert(len(self.nodes[0].paymentrequestvotelist()["yes"]) == 0)
+        assert(len(self.nodes[0].paymentrequestvotelist()["no"]) == 0)
+        assert(len(self.nodes[0].paymentrequestvotelist()["null"]) == 3)
+
+        # Vote on the payment requests as wished
+        self.nodes[0].paymentrequestvote(preqid0_a, "yes")
+        self.nodes[0].paymentrequestvote(preqid0_b, "no")
+        self.nodes[0].paymentrequestvote(preqid1_c, "yes")
+        self.nodes[0].paymentrequestvote(preqid1_c, "remove")
+
+        # Verify the payment request vote list has changed according to the wallet's votes
+        assert(len(self.nodes[0].paymentrequestvotelist()["yes"]) == 1)
+        assert(len(self.nodes[0].paymentrequestvotelist()["no"]) == 1)
+        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])
+
+        # Revote differently
+        self.nodes[0].paymentrequestvote(preqid0_a, "no")
+        self.nodes[0].paymentrequestvote(preqid0_b, "yes")
+        self.nodes[0].paymentrequestvote(preqid1_c, "no")
+
+        # Verify the payment request vote list has changed according to the wallet's votes
+        assert(len(self.nodes[0].paymentrequestvotelist()["yes"]) == 1)
+        assert(len(self.nodes[0].paymentrequestvotelist()["no"]) == 2)
+        assert(len(self.nodes[0].paymentrequestvotelist()["null"]) == 0)
+
+
+        # Create new payment request
+        preq0_d = self.nodes[0].createpaymentrequest(proposalid0, 1, "preq0_d")["hash"]
+        slow_gen(self.nodes[0], 1)
+
+        # 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])
+
+
+if __name__ == '__main__':
+    CommunityFundPaymentRequestVoteListTest().main()

qa/rpc-tests/cfund-proposalvotelist.py

@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Navcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import NavCoinTestFramework
+from test_framework.cfund_util import *
+
+import time
+
+class CommunityFundProposalVoteListTest(NavCoinTestFramework):
+    """Tests the proposalvotelist function of the Community fund."""
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        self.nodes = self.setup_nodes()
+        self.is_network_split = split
+
+    def run_test(self):
+        # Make sure cfund is active
+        activate_cfund(self.nodes[0])
+        self.nodes[0].donatefund(1000)
+
+        # Preflight checks
+        assert(len(self.nodes[0].proposalvotelist()["yes"]) == 0)
+        assert(len(self.nodes[0].proposalvotelist()["no"]) == 0)
+        assert(len(self.nodes[0].proposalvotelist()["null"]) == 0)
+
+        address0 = self.nodes[0].getnewaddress()
+
+        # Create 3 proposals
+        proposalid0 = self.nodes[0].createproposal(address0, 1, 3600, "test0")["hash"]
+        proposalid1 = self.nodes[0].createproposal(address0, 1, 3600, "test1")["hash"]
+        proposalid2 = self.nodes[0].createproposal(address0, 1, 3600, "test2")["hash"]
+        slow_gen(self.nodes[0], 1)
+
+        # Verify the proposals are now in the proposal vote list
+        assert(len(self.nodes[0].proposalvotelist()["yes"]) == 0)
+        assert(len(self.nodes[0].proposalvotelist()["no"]) == 0)
+        assert(len(self.nodes[0].proposalvotelist()["null"]) == 3)
+
+        # Vote on the proposals as wished
+        self.nodes[0].proposalvote(proposalid0, "yes")
+        self.nodes[0].proposalvote(proposalid1, "no")
+        self.nodes[0].proposalvote(proposalid2, "yes")
+        self.nodes[0].proposalvote(proposalid2, "remove")
+
+        # Verify the proposal vote list has changed according to the wallet's votes
+        assert(len(self.nodes[0].proposalvotelist()["yes"]) == 1)
+        assert(len(self.nodes[0].proposalvotelist()["no"]) == 1)
+        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])
+
+        # Revote differently
+        self.nodes[0].proposalvote(proposalid0, "no")
+        self.nodes[0].proposalvote(proposalid1, "yes")
+        self.nodes[0].proposalvote(proposalid2, "no")
+
+        # Verify the proposal vote list has changed according to the wallet's votes
+        assert(len(self.nodes[0].proposalvotelist()["yes"]) == 1)
+        assert(len(self.nodes[0].proposalvotelist()["no"]) == 2)
+        assert(len(self.nodes[0].proposalvotelist()["null"]) == 0)
+
+
+        # Create new proposal
+        proposalid3 = self.nodes[0].createproposal(address0, 1, 3600, "test3")["hash"]
+        slow_gen(self.nodes[0], 1)
+
+        # 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])
+
+
+if __name__ == '__main__':
+    CommunityFundProposalVoteListTest().main()

qa/rpc-tests/cfund-vote.py

@@ -21,17 +21,9 @@ def setup_network(self, split=False):
         self.is_network_split = split
 
     def run_test(self):
-        slow_gen(self.nodes[0], 100)
-        # Verify the Community Fund is started
-        assert(self.nodes[0].getblockchaininfo()["bip9_softforks"]["communityfund"]["status"] == "started")
-
-        slow_gen(self.nodes[0], 100)
-        # Verify the Community Fund is locked_in
-        assert(self.nodes[0].getblockchaininfo()["bip9_softforks"]["communityfund"]["status"] == "locked_in")
-
-        slow_gen(self.nodes[0], 100)
-        # Verify the Community Fund is active
-        assert(self.nodes[0].getblockchaininfo()["bip9_softforks"]["communityfund"]["status"] == "active")
+        # Make sure cfund is active
+        activate_cfund(self.nodes[0])
+        self.nodes[0].donatefund(1000)
 
         proposalid0 = self.nodes[0].createproposal(self.nodes[0].getnewaddress(), 1, 3600, "test")["hash"]
         slow_gen(self.nodes[0], 1)

src/consensus/cfund.h

@@ -112,8 +112,8 @@ class CPaymentRequest
     std::string ToString() const {
         return strprintf("CPaymentRequest(hash=%s, nVersion=%d, nAmount=%f, fState=%s, nVotesYes=%u, nVotesNo=%u, nVotingCycle=%u, "
                          " proposalhash=%s, blockhash=%s, paymenthash=%s, strDZeel=%s)",
-                         hash.ToString().substr(0,10), nVersion, (float)nAmount/COIN, GetState(), nVotesYes, nVotesNo,
-                         nVotingCycle, proposalhash.ToString().substr(0,10), blockhash.ToString().substr(0,10),
+                         hash.ToString(), nVersion, (float)nAmount/COIN, GetState(), nVotesYes, nVotesNo,
+                         nVotingCycle, proposalhash.ToString(), blockhash.ToString().substr(0,10),
                          paymenthash.ToString().substr(0,10), strDZeel);
     }
 

src/rpc/blockchain.cpp

@@ -897,7 +897,7 @@ UniValue listproposals(const UniValue& params, bool fHelp)
 
      if (fHelp)
         throw runtime_error(
-            "listproposals filter\n"
+            "listproposals \"filter\"\n"
             "\nList the proposals and all the relating data including payment requests and status.\n"
             "\nNote passing no argument returns all proposals regardless of state.\n"
             "\nArguments:\n"
@@ -954,7 +954,7 @@ UniValue listproposals(const UniValue& params, bool fHelp)
 UniValue cfundstats(const UniValue& params, bool fHelp)
 {
 
-    if (fHelp)
+    if (fHelp || params.size() != 0)
         throw runtime_error(
             "cfundstats\n"
             "\nReturns statistics about the community fund.\n"
@@ -1602,7 +1602,7 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         okSafeMode
   //  --------------------- ------------------------  -----------------------  ----------
-    { "blockchain",         "cfundstats",             &cfundstats,             true  },
+    { "communityfund",      "cfundstats",             &cfundstats,             true  },
     { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true  },
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true  },
     { "blockchain",         "getblockcount",          &getblockcount,          true  },
@@ -1617,13 +1617,13 @@ static const CRPCCommand commands[] =
     { "blockchain",         "getmempooldescendants",  &getmempooldescendants,  true  },
     { "blockchain",         "getmempoolentry",        &getmempoolentry,        true  },
     { "blockchain",         "getmempoolinfo",         &getmempoolinfo,         true  },
-    { "blockchain",         "getproposal",            &getproposal,            true  },
-    { "blockchain",         "getpaymentrequest",      &getpaymentrequest,      true  },
+    { "communityfund",      "getproposal",            &getproposal,            true  },
+    { "communityfund",      "getpaymentrequest",      &getpaymentrequest,      true  },
     { "blockchain",         "getrawmempool",          &getrawmempool,          true  },
     { "blockchain",         "gettxout",               &gettxout,               true  },
     { "blockchain",         "gettxoutsetinfo",        &gettxoutsetinfo,        true  },
     { "blockchain",         "verifychain",            &verifychain,            true  },
-    { "blockchain",         "listproposals",          &listproposals,          true  },
+    { "communityfund",      "listproposals",          &listproposals,          true  },
 
     /* Not shown in help */
     { "hidden",             "invalidateblock",        &invalidateblock,        true  },