[Fluid] Cleanup code, remove unused comments and code

AmirAbrams · AmirAbrams · commit 71ed6b6e40d1 · 2019-05-22T00:00:55.000-05:00
diff --git a/src/bdap/domainentrydb.cpp b/src/bdap/domainentrydb.cpp
@@ -23,7 +23,7 @@ bool GetDomainEntry(const std::vector<unsigned char>& vchObjectPath, CDomainEntr
         return false;
     }
     
-    if ((unsigned int)chainActive.Tip()->GetMedianTimePast() >= entry.nExpireTime) {
+    if (chainActive.Tip() && (unsigned int)chainActive.Tip()->GetMedianTimePast() >= entry.nExpireTime) {
         entry.SetNull();
         return false;
     }
diff --git a/src/fluid/fluid.cpp b/src/fluid/fluid.cpp
@@ -601,22 +601,7 @@ bool CFluid::CheckTransactionInRecord(const CScript& fluidInstruction, CBlockInd
 {
     if (IsTransactionFluid(fluidInstruction)) {
         std::string verificationString;
-        //TODO fluid
-        /*
-        CFluidEntry fluidIndex;
-        if (chainActive.Height() <= fluid.FLUID_ACTIVATE_HEIGHT) {
-            return false;
-        }
-        else if (pindex == nullptr) {
-            GetLastBlockIndex(chainActive.Tip());
-            //TODO fluid
-            //fluidIndex = chainActive.Tip()->fluidParams;
-        } else {
-            //TODO fluid
-            //fluidIndex = pindex->fluidParams;
-        }
-        */
-        std::vector<std::string> transactionRecord; //fluidIndex.fluidHistory;
+        std::vector<std::string> transactionRecord;
         std::string verificationWithoutOpCode = GetRidOfScriptStatement(verificationString);
         std::string message;
         if (CheckIfQuorumExists(verificationString, message)) {
diff --git a/src/fluid/fluiddynode.cpp b/src/fluid/fluiddynode.cpp
@@ -68,8 +68,6 @@ bool GetFluidDynodeData(const CTransaction& tx, CFluidDynode& entry, int& nOut)
 
 bool CFluidDynode::UnserializeFromTx(const CTransaction& tx)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     int nOut;
     if (!GetFluidDynodeData(tx, *this, nOut)) {
         SetNull();
@@ -80,8 +78,6 @@ bool CFluidDynode::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidDynode::UnserializeFromScript(const CScript& fluidScript)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     if (!GetFluidDynodeData(fluidScript, *this)) {
         SetNull();
         return false;
diff --git a/src/fluid/fluidmining.cpp b/src/fluid/fluidmining.cpp
@@ -68,8 +68,6 @@ bool GetFluidMiningData(const CTransaction& tx, CFluidMining& entry, int& nOut)
 
 bool CFluidMining::UnserializeFromTx(const CTransaction& tx)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     int nOut;
     if (!GetFluidMiningData(tx, *this, nOut)) {
         SetNull();
@@ -80,8 +78,6 @@ bool CFluidMining::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidMining::UnserializeFromScript(const CScript& fluidScript)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     if (!GetFluidMiningData(fluidScript, *this)) {
         SetNull();
         return false;
diff --git a/src/fluid/fluidmint.cpp b/src/fluid/fluidmint.cpp
@@ -72,8 +72,6 @@ bool GetFluidMintData(const CTransaction& tx, CFluidMint& entry, int& nOut)
 
 bool CFluidMint::UnserializeFromTx(const CTransaction& tx)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     int nOut;
     if (!GetFluidMintData(tx, *this, nOut)) {
         SetNull();
@@ -84,8 +82,6 @@ bool CFluidMint::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidMint::UnserializeFromScript(const CScript& fluidScript)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     if (!GetFluidMintData(fluidScript, *this)) {
         SetNull();
         return false;
diff --git a/src/fluid/fluidsovereign.cpp b/src/fluid/fluidsovereign.cpp
@@ -60,8 +60,6 @@ bool GetFluidSovereignData(const CTransaction& tx, CFluidSovereign& entry, int&
 
 bool CFluidSovereign::UnserializeFromTx(const CTransaction& tx)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     int nOut;
     if (!GetFluidSovereignData(tx, *this, nOut)) {
         SetNull();
@@ -72,8 +70,6 @@ bool CFluidSovereign::UnserializeFromTx(const CTransaction& tx)
 
 bool CFluidSovereign::UnserializeFromScript(const CScript& fluidScript)
 {
-    std::vector<unsigned char> vchData;
-    std::vector<unsigned char> vchHash;
     if (!GetFluidSovereignData(fluidScript, *this)) {
         SetNull();
         return false;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ bool GetDomainEntry(const std::vector<unsigned char>& vchObjectPath, CDomainEntr`
`23`	`23`	`return false;`
`24`	`24`	`}`
`25`	`25`
`26`		`- if ((unsigned int)chainActive.Tip()->GetMedianTimePast() >= entry.nExpireTime) {`
	`26`	`+ if (chainActive.Tip() && (unsigned int)chainActive.Tip()->GetMedianTimePast() >= entry.nExpireTime) {`
`27`	`27`	`entry.SetNull();`
`28`	`28`	`return false;`
`29`	`29`	`}`