[Cleanup] Refactor CPivStake::CreateTxIn into GetTxIn

random-zebra · random-zebra · commit 5f3d3ba82ff0 · 2021-05-03T16:51:19.000+02:00
diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp
@@ -46,10 +46,9 @@ bool CPivStake::GetTxOutFrom(CTxOut& out) const
     return true;
 }
 
-bool CPivStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)
+CTxIn CPivStake::GetTxIn() const
 {
-    txIn = CTxIn(outpointFrom.hash, outpointFrom.n);
-    return true;
+    return CTxIn(outpointFrom.hash, outpointFrom.n);
 }
 
 CAmount CPivStake::GetValue() const
diff --git a/src/stakeinput.h b/src/stakeinput.h
@@ -23,7 +23,6 @@ class CStakeInput
     virtual ~CStakeInput(){};
     virtual bool InitFromTxIn(const CTxIn& txin) = 0;
     virtual const CBlockIndex* GetIndexFrom() const = 0;
-    virtual bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = UINT256_ZERO) = 0;
     virtual bool GetTxOutFrom(CTxOut& out) const = 0;
     virtual CAmount GetValue() const = 0;
     virtual bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) = 0;
@@ -50,7 +49,7 @@ class CPivStake : public CStakeInput
     bool GetTxOutFrom(CTxOut& out) const override;
     CAmount GetValue() const override;
     CDataStream GetUniqueness() const override;
-    bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = UINT256_ZERO) override;
+    CTxIn GetTxIn() const;
     bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) override;
     bool IsZPIV() const override { return false; }
     bool ContextCheck(int nHeight, uint32_t nTime) override;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3296,24 +3296,16 @@ bool CWallet::CreateCoinStake(
         // put the remaining on the last output (which all into the first if only one output)
         txNew.vout[outputs].nValue += nRemaining;
 
-        // Limit size
-        unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION);
-        if (nBytes >= DEFAULT_BLOCK_MAX_SIZE / 5)
-            return error("%s : exceeded coinstake size limit", __func__);
+        // Set coinstake input
+        txNew.vin.emplace_back(stakeInput.GetTxIn());
 
         // Masternode payment
         FillBlockPayee(txNew, pindexPrev->nHeight + 1, true);
 
-        const uint256& hashTxOut = txNew.GetHash();
-        CTxIn in;
-        if (!stakeInput.CreateTxIn(this, in, hashTxOut)) {
-            LogPrintf("%s : failed to create TxIn\n", __func__);
-            txNew.vin.clear();
-            txNew.vout.clear();
-            it++;
-            continue;
-        }
-        txNew.vin.emplace_back(in);
+        // Limit size
+        unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION);
+        if (nBytes >= DEFAULT_BLOCK_MAX_SIZE / 5)
+            return error("%s : exceeded coinstake size limit", __func__);
 
         break;
     }
diff --git a/src/zpiv/zpos.h b/src/zpiv/zpos.h
@@ -25,7 +25,6 @@ class CLegacyZPivStake : public CStakeInput
     const CBlockIndex* GetIndexFrom() const override;
     CAmount GetValue() const override;
     CDataStream GetUniqueness() const override;
-    bool CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut = UINT256_ZERO) override { return false; /* creation disabled */}
     bool CreateTxOuts(CWallet* pwallet, std::vector<CTxOut>& vout, CAmount nTotal) override { return false; /* creation disabled */}
     bool GetTxOutFrom(CTxOut& out) const override { return false; /* not available */ }
     virtual bool ContextCheck(int nHeight, uint32_t nTime) override;

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,9 @@ bool CPivStake::GetTxOutFrom(CTxOut& out) const`
`46`	`46`	`return true;`
`47`	`47`	`}`
`48`	`48`
`49`		`-bool CPivStake::CreateTxIn(CWallet* pwallet, CTxIn& txIn, uint256 hashTxOut)`
	`49`	`+CTxIn CPivStake::GetTxIn() const`
`50`	`50`	`{`
`51`		`- txIn = CTxIn(outpointFrom.hash, outpointFrom.n);`
`52`		`- return true;`
	`51`	`+ return CTxIn(outpointFrom.hash, outpointFrom.n);`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`CAmount CPivStake::GetValue() const`