Refactor: Do not call masternode-payments object from the masternode-payments object.

furszy · furszy · commit 5833e698747f · 2021-10-12T10:27:32.000-03:00
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -431,7 +431,7 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st
         }
 
         pfrom->FulfilledRequest(NetMsgType::GETMNWINNERS);
-        masternodePayments.Sync(pfrom, nCountNeeded);
+        Sync(pfrom, nCountNeeded);
         LogPrint(BCLog::MASTERNODE, "mnget - Sent Masternode winners to peer %i\n", pfrom->GetId());
     } else if (strCommand == NetMsgType::MNWINNER) { //Masternode Payments Declare Winner
         //this is required in litemodef
@@ -448,7 +448,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod
 {
     int nHeight = mnodeman.GetBestHeight();
 
-    if (masternodePayments.mapMasternodePayeeVotes.count(winner.GetHash())) {
+    if (mapMasternodePayeeVotes.count(winner.GetHash())) {
         LogPrint(BCLog::MASTERNODE, "mnw - Already seen - %s bestHeight %d\n", winner.GetHash().ToString().c_str(), nHeight);
         masternodeSync.AddedMasternodeWinner(winner.GetHash());
         return false;
@@ -471,7 +471,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod
         return false;
     }
 
-    if (!masternodePayments.CanVote(winner.vinMasternode.prevout, winner.nBlockHeight)) {
+    if (!CanVote(winner.vinMasternode.prevout, winner.nBlockHeight)) {
         return state.Error("MN already voted");
     }
 
@@ -503,7 +503,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod
         return state.Error("invalid voter mnwinner signature");
     }
 
-    if (!masternodePayments.AddWinningMasternode(winner)) {
+    if (!AddWinningMasternode(winner)) {
         return state.Error("Failed to add mnwinner"); // move state inside AddWinningMasternode
     }
 
diff --git a/src/test/mnpayments_tests.cpp b/src/test/mnpayments_tests.cpp
@@ -162,7 +162,6 @@ BOOST_FIXTURE_TEST_CASE(mnwinner_test, TestChain100Setup)
     // Voter MN2, fail because MN2 is not enabled
     pSecondMN->SetSpent();
     BOOST_CHECK(!pSecondMN->IsEnabled());
-    mnVinVoter = CTxIn(pSecondMN->vin);
     CValidationState state3;
     BOOST_CHECK(!CreateMNWinnerPayment(mnVinVoter, paymentBlockHeight, payeeScript,
                                        secondMn.data.mnPrivKey, secondMn.data.mnPubKey, state3));

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`pfrom->FulfilledRequest(NetMsgType::GETMNWINNERS);`
`434`		`- masternodePayments.Sync(pfrom, nCountNeeded);`
	`434`	`+ Sync(pfrom, nCountNeeded);`
`435`	`435`	`LogPrint(BCLog::MASTERNODE, "mnget - Sent Masternode winners to peer %i\n", pfrom->GetId());`
`436`	`436`	`} else if (strCommand == NetMsgType::MNWINNER) { //Masternode Payments Declare Winner`
`437`	`437`	`//this is required in litemodef`
`@@ -448,7 +448,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod`
`448`	`448`	`{`
`449`	`449`	`int nHeight = mnodeman.GetBestHeight();`
`450`	`450`
`451`		`- if (masternodePayments.mapMasternodePayeeVotes.count(winner.GetHash())) {`
	`451`	`+ if (mapMasternodePayeeVotes.count(winner.GetHash())) {`
`452`	`452`	`LogPrint(BCLog::MASTERNODE, "mnw - Already seen - %s bestHeight %d\n", winner.GetHash().ToString().c_str(), nHeight);`
`453`	`453`	`masternodeSync.AddedMasternodeWinner(winner.GetHash());`
`454`	`454`	`return false;`
`@@ -471,7 +471,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod`
`471`	`471`	`return false;`
`472`	`472`	`}`
`473`	`473`
`474`		`- if (!masternodePayments.CanVote(winner.vinMasternode.prevout, winner.nBlockHeight)) {`
	`474`	`+ if (!CanVote(winner.vinMasternode.prevout, winner.nBlockHeight)) {`
`475`	`475`	`return state.Error("MN already voted");`
`476`	`476`	`}`
`477`	`477`
`@@ -503,7 +503,7 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod`
`503`	`503`	`return state.Error("invalid voter mnwinner signature");`
`504`	`504`	`}`
`505`	`505`
`506`		`- if (!masternodePayments.AddWinningMasternode(winner)) {`
	`506`	`+ if (!AddWinningMasternode(winner)) {`
`507`	`507`	`return state.Error("Failed to add mnwinner"); // move state inside AddWinningMasternode`
`508`	`508`	`}`
`509`	`509`