Merge pull request #15 from DeathRay1977/master

Perfect, thanks!
dashpay · Jul 1, 2014 · 212015e · 212015e
2 parents 97cac8b + b776437
commit 212015e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -5840,12 +5840,15 @@ class CMainCleanup
 */
 
 
-void CDarkSendPool::SetCollateralAddress(std::string strAddress){
+bool CDarkSendPool::SetCollateralAddress(std::string strAddress){
     CBitcoinAddress address;
     if (!address.SetString(strAddress))
+    {
         printf("CDarkSendPool::SetCollateralAddress - Invalid DarkSend collateral address\n");
-
+        return false;
+    }
     collateralPubKey.SetDestination(address.Get());
+    return true;
 }
 
 //Get last block hash

diff --git a/src/main.h b/src/main.h
@@ -2516,7 +2516,7 @@ class CDarkSendPool
         SetCollateralAddress(strAddress);
     }
 
-    void SetCollateralAddress(std::string strAddress);
+    bool SetCollateralAddress(std::string strAddress);
     bool GetLastValidBlockHash(uint256& hash, int mod=10);
     int GetCurrentMasterNode(int mod=10);
     void NewBlock();

diff --git a/src/test/darksend_tests.cpp b/src/test/darksend_tests.cpp
@@ -27,6 +27,36 @@ BOOST_AUTO_TEST_CASE(darksend_sign)
 
 }
 
+BOOST_AUTO_TEST_CASE(set_collateral_address_bad)
+{
+	CDarkSendPool * dsp_ptr = new CDarkSendPool();
+
+	string crappy = "badaddress";
+
+	BOOST_CHECK( dsp_ptr->SetCollateralAddress(crappy) == false );
+	delete dsp_ptr;
+}
+
+BOOST_AUTO_TEST_CASE(set_collateral_address_production)
+{
+	CDarkSendPool * dsp_ptr = new CDarkSendPool();
+
+	string prod = "Xq19GqFvajRrEdDHYRKGYjTsQfpV5jyipF";
+
+	BOOST_CHECK( dsp_ptr->SetCollateralAddress(prod) == true );
+	delete dsp_ptr;
+}
+
+BOOST_AUTO_TEST_CASE(set_collateral_address_testnet)
+{
+	CDarkSendPool * dsp_ptr = new CDarkSendPool();
+
+	string testnet = "mxE2Rp3oYpSEFdsN5TdHWhZvEHm3PJQQVm";
+
+	BOOST_CHECK( dsp_ptr->SetCollateralAddress(testnet) == true );
+	delete dsp_ptr;
+}
+
 
 BOOST_AUTO_TEST_CASE(darksend_vote)
 {