Skip to content

Commit

Permalink
Revert "rename all SidechainDB class according to bitcoin style guide (…
Browse files Browse the repository at this point in the history 
…bitcoin#10)" (bitcoin#12)

This reverts commit 4eb5c1d.
  • Loading branch information
@CryptAxe
CryptAxe committed Jun 4, 2017
1 parent 4eb5c1d commit 18a606d
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 42 deletions.
48 changes: 24 additions & 24 deletions src/sidechaindb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include "utilstrencodings.h"
#include "wallet/wallet.h"

CSidechainDB::CSidechainDB()
SidechainDB::SidechainDB()
{
SCDB.resize(ARRAYLEN(ValidSidechains));
}

void CSidechainDB::AddDeposits(const std::vector<CTransaction>& vtx)
void SidechainDB::AddDeposits(const std::vector<CTransaction>& vtx)
{
std::vector<SidechainDeposit> vDeposit;
for (const CTransaction& tx : vtx) {
Expand Down Expand Up @@ -65,7 +65,7 @@ void CSidechainDB::AddDeposits(const std::vector<CTransaction>& vtx)
}
}

bool CSidechainDB::AddWTJoin(uint8_t nSidechain, const CTransaction& tx)
bool SidechainDB::AddWTJoin(uint8_t nSidechain, const CTransaction& tx)
{
if (vWTJoinCache.size() >= SIDECHAIN_MAX_WT)
return false;
Expand All @@ -82,7 +82,7 @@ bool CSidechainDB::AddWTJoin(uint8_t nSidechain, const CTransaction& tx)
return false;
}

bool CSidechainDB::HaveDepositCached(const SidechainDeposit &deposit) const
bool SidechainDB::HaveDepositCached(const SidechainDeposit &deposit) const
{
for (const SidechainDeposit& d : vDepositCache) {
if (d == deposit)
Expand All @@ -91,7 +91,7 @@ bool CSidechainDB::HaveDepositCached(const SidechainDeposit &deposit) const
return false;
}

bool CSidechainDB::HaveWTJoinCached(const uint256& wtxid) const
bool SidechainDB::HaveWTJoinCached(const uint256& wtxid) const
{
for (const CTransaction& tx : vWTJoinCache) {
if (tx.GetHash() == wtxid)
Expand All @@ -100,7 +100,7 @@ bool CSidechainDB::HaveWTJoinCached(const uint256& wtxid) const
return false;
}

std::vector<SidechainDeposit> CSidechainDB::GetDeposits(uint8_t nSidechain) const
std::vector<SidechainDeposit> SidechainDB::GetDeposits(uint8_t nSidechain) const
{
std::vector<SidechainDeposit> vSidechainDeposit;
for (size_t i = 0; i < vDepositCache.size(); i++) {
Expand All @@ -110,7 +110,7 @@ std::vector<SidechainDeposit> CSidechainDB::GetDeposits(uint8_t nSidechain) cons
return vSidechainDeposit;
}

CTransaction CSidechainDB::GetWTJoinTx(uint8_t nSidechain, int nHeight) const
CTransaction SidechainDB::GetWTJoinTx(uint8_t nSidechain, int nHeight) const
{
if (!HasState())
return CTransaction();
Expand Down Expand Up @@ -217,7 +217,7 @@ CTransaction CSidechainDB::GetWTJoinTx(uint8_t nSidechain, int nHeight) const
return mtx;
}

CScript CSidechainDB::CreateStateScript(int nHeight) const
CScript SidechainDB::CreateStateScript(int nHeight) const
{
if (!HasState())
return CScript();
Expand Down Expand Up @@ -273,7 +273,7 @@ CScript CSidechainDB::CreateStateScript(int nHeight) const
return script;
}

uint256 CSidechainDB::GetSCDBHash() const
uint256 SidechainDB::GetSCDBHash() const
{
CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
for (const SCDBIndex& index : SCDB) {
Expand All @@ -287,7 +287,7 @@ uint256 CSidechainDB::GetSCDBHash() const
return ss.GetHash();
}

bool CSidechainDB::ReadStateScript(const CTransactionRef& coinbase)
bool SidechainDB::ReadStateScript(const CTransactionRef& coinbase)
{
/*
* Only one state script of the current version is valid.
Expand Down Expand Up @@ -336,12 +336,12 @@ bool CSidechainDB::ReadStateScript(const CTransactionRef& coinbase)

// Invalid or no update script try to apply default
if (!ApplyDefaultUpdate())
LogPrintf("CSidechainDB::ReadStateScript: Invalid update & failed to apply default update!\n");
LogPrintf("SidechainDB::ReadStateScript: Invalid update & failed to apply default update!\n");

return false;
}

bool CSidechainDB::Update(uint8_t nSidechain, uint16_t nBlocks, uint16_t nScore, uint256 wtxid, bool fJustCheck)
bool SidechainDB::Update(uint8_t nSidechain, uint16_t nBlocks, uint16_t nScore, uint256 wtxid, bool fJustCheck)
{
if (!SidechainNumberValid(nSidechain))
return false;
Expand All @@ -362,7 +362,7 @@ bool CSidechainDB::Update(uint8_t nSidechain, uint16_t nBlocks, uint16_t nScore,
return (index.InsertMember(member));
}

bool CSidechainDB::Update(int nHeight, const uint256& hashBlock, const CTransactionRef& coinbase)
bool SidechainDB::Update(int nHeight, const uint256& hashBlock, const CTransactionRef& coinbase)
{
if (!coinbase || !coinbase->IsCoinBase())
return false;
Expand All @@ -376,7 +376,7 @@ bool CSidechainDB::Update(int nHeight, const uint256& hashBlock, const CTransact

// Apply state script
if (!ReadStateScript(coinbase))
LogPrintf("CSidechainDB::Update: failed to read state script\n");
LogPrintf("SidechainDB::Update: failed to read state script\n");

// Scan for h*(s) in coinbase outputs
for (const CTxOut& out : coinbase->vout) {
Expand Down Expand Up @@ -426,7 +426,7 @@ bool CSidechainDB::Update(int nHeight, const uint256& hashBlock, const CTransact
}

if (!fValid) {
LogPrintf("CSidechainDB::Update: h* with invalid block height ignored: %s\n", hashCritical.ToString());
LogPrintf("SidechainDB::Update: h* with invalid block height ignored: %s\n", hashCritical.ToString());
continue;
}

Expand All @@ -449,17 +449,17 @@ bool CSidechainDB::Update(int nHeight, const uint256& hashBlock, const CTransact
return true;
}

uint256 CSidechainDB::GetHashBlockLastSeen()
uint256 SidechainDB::GetHashBlockLastSeen()
{
return hashBlockLastSeen;
}

std::multimap<uint256, int> CSidechainDB::GetLinkingData() const
std::multimap<uint256, int> SidechainDB::GetLinkingData() const
{
return mapBMMLD;
}

bool CSidechainDB::HasState() const
bool SidechainDB::HasState() const
{
// Make sure that SCDB is actually initialized
if (SCDB.size() != ARRAYLEN(ValidSidechains))
Expand All @@ -478,7 +478,7 @@ bool CSidechainDB::HasState() const
return false;
}

std::vector<SidechainWTJoinState> CSidechainDB::GetState(uint8_t nSidechain) const
std::vector<SidechainWTJoinState> SidechainDB::GetState(uint8_t nSidechain) const
{
if (!HasState() || !SidechainNumberValid(nSidechain))
return std::vector<SidechainWTJoinState>();
Expand All @@ -491,7 +491,7 @@ std::vector<SidechainWTJoinState> CSidechainDB::GetState(uint8_t nSidechain) con
return vState;
}

bool CSidechainDB::ApplyStateScript(const CScript& script, const std::vector<std::vector<SidechainWTJoinState>>& vState, bool fJustCheck)
bool SidechainDB::ApplyStateScript(const CScript& script, const std::vector<std::vector<SidechainWTJoinState>>& vState, bool fJustCheck)
{
if (script.size() < 4)
return false;
Expand Down Expand Up @@ -547,7 +547,7 @@ bool CSidechainDB::ApplyStateScript(const CScript& script, const std::vector<std
return true;
}

bool CSidechainDB::ApplyDefaultUpdate()
bool SidechainDB::ApplyDefaultUpdate()
{
if (!HasState())
return true;
Expand All @@ -572,7 +572,7 @@ bool CSidechainDB::ApplyDefaultUpdate()
return true;
}

bool CSidechainDB::CheckWorkScore(const uint8_t& nSidechain, const uint256& wtxid) const
bool SidechainDB::CheckWorkScore(const uint8_t& nSidechain, const uint256& wtxid) const
{
if (!SidechainNumberValid(nSidechain))
return false;
Expand All @@ -589,10 +589,10 @@ bool CSidechainDB::CheckWorkScore(const uint8_t& nSidechain, const uint256& wtxi
return false;
}

std::string CSidechainDB::ToString() const
std::string SidechainDB::ToString() const
{
std::string str;
str += "CSidechainDB:\n";
str += "SidechainDB:\n";
for (const Sidechain& s : ValidSidechains) {
// Print sidechain name
str += "Sidechain: " + s.GetSidechainName() + "\n";
Expand Down
4 changes: 2 additions & 2 deletions src/sidechaindb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ struct SidechainDeposit;
struct SidechainWTJoinState;
struct SCDBIndex;

class CSidechainDB
class SidechainDB
{
public:
CSidechainDB();
SidechainDB();

/** Add deposit to cache */
void AddDeposits(const std::vector<CTransaction>& vtx);
Expand Down
26 changes: 13 additions & 13 deletions src/test/sidechaindb_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ BOOST_FIXTURE_TEST_SUITE(sidechaindb_tests, TestChain100Setup)

BOOST_AUTO_TEST_CASE(sidechaindb_isolated)
{
// Test CSidechainDB without blocks
CSidechainDB scdb;
// Test SidechainDB without blocks
SidechainDB scdb;

uint256 hashWTTest = GetRandHash();
uint256 hashWTHivemind = GetRandHash();
Expand All @@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_MultipleTauPeriods)
{
// Test SCDB with multiple tau periods,
// approve multiple WT^s on the same sidechain.
CSidechainDB scdb;
SidechainDB scdb;
const Sidechain& test = ValidSidechains[SIDECHAIN_TEST];

// WT^ hash for first period
Expand Down Expand Up @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_EmptyStateScript)
// Test empty SCDB
const Sidechain& sidechainTest = ValidSidechains[SIDECHAIN_TEST];
CScript scriptEmptyExpected = CScript();
CSidechainDB scdbEmpty;
SidechainDB scdbEmpty;
BOOST_CHECK(scriptEmptyExpected == scdbEmpty.CreateStateScript(sidechainTest.GetTau() - 1));
}

Expand All @@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_PopulatedStateScript)
<< SCOP_VERIFY << SCOP_SC_DELIM
<< SCOP_VERIFY;

CSidechainDB scdbPopulated;
SidechainDB scdbPopulated;

uint256 hashWTTest = GetRandHash();
uint256 hashWTHivemind = GetRandHash();
Expand All @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_FullStateScript)
<< SCOP_SC_DELIM
<< SCOP_VERIFY << SCOP_WT_DELIM << SCOP_REJECT << SCOP_WT_DELIM << SCOP_REJECT;

CSidechainDB scdbFull;
SidechainDB scdbFull;

uint256 hashWTTest1 = GetRandHash();
uint256 hashWTTest2 = GetRandHash();
Expand Down Expand Up @@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_CountStateScript)
<< SCOP_REJECT << SCOP_WT_DELIM << SCOP_VERIFY
<< SCOP_SC_DELIM
<< SCOP_REJECT << SCOP_WT_DELIM << SCOP_VERIFY << SCOP_WT_DELIM << SCOP_REJECT;
CSidechainDB scdbCount;
SidechainDB scdbCount;

uint256 hashWTTest = GetRandHash();

Expand All @@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_CountStateScript)

BOOST_AUTO_TEST_CASE(sidechaindb_PositionStateScript)
{
// Verify that state scripts created based on known CSidechainDB
// Verify that state scripts created based on known SidechainDB
// state examples are formatted as expected
const Sidechain& sidechainTest = ValidSidechains[SIDECHAIN_TEST];

Expand All @@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_PositionStateScript)
<< SCOP_SC_DELIM
<< SCOP_REJECT << SCOP_WT_DELIM << SCOP_REJECT << SCOP_WT_DELIM << SCOP_VERIFY;

CSidechainDB scdbPosition;
SidechainDB scdbPosition;

uint256 hashWTTest1 = GetRandHash();
uint256 hashWTTest2 = GetRandHash();
Expand Down Expand Up @@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE(sidechaindb_PositionStateScript)
BOOST_AUTO_TEST_CASE(bmm_checkCriticalHashValid)
{
// Check that valid critical hash is added to ratchet
CSidechainDB scdb;
SidechainDB scdb;

// Create h* bribe script
uint256 hashCritical = GetRandHash();
Expand Down Expand Up @@ -281,7 +281,7 @@ BOOST_AUTO_TEST_CASE(bmm_checkCriticalHashInvalid)
{
// Make sure that a invalid h* with a valid block number will
// be rejected.
CSidechainDB scdb;
SidechainDB scdb;

// Create h* bribe script
CScript scriptPubKey;
Expand All @@ -308,7 +308,7 @@ BOOST_AUTO_TEST_CASE(bmm_checkBlockNumberValid)
{
// Make sure that a valid h* with a valid block number
// will be accepted.
CSidechainDB scdb;
SidechainDB scdb;

// We have to add the first h* to the ratchet so that
// there is something to compare with.
Expand Down Expand Up @@ -353,7 +353,7 @@ BOOST_AUTO_TEST_CASE(bmm_checkBlockNumberInvalid)
{
// Try to add a valid h* with an invalid block number
// and make sure it is skipped.
CSidechainDB scdb;
SidechainDB scdb;

// We have to add the first h* to the ratchet so that
// there is something to compare with.
Expand Down
2 changes: 1 addition & 1 deletion src/validation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
CBlockPolicyEstimator feeEstimator;
CTxMemPool mempool(&feeEstimator);

CSidechainDB scdb;
SidechainDB scdb;

static void CheckBlockIndex(const Consensus::Params& consensusParams);

Expand Down
4 changes: 2 additions & 2 deletions src/validation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class CBlockPolicyEstimator;
class CTxMemPool;
class CValidationInterface;
class CValidationState;
class CSidechainDB;
class SidechainDB;
struct ChainTxData;

struct PrecomputedTransactionData;
Expand Down Expand Up @@ -528,7 +528,7 @@ void DumpMempool();
bool LoadMempool();

/** Tracks validation status of sidechain WT^(s) */
extern CSidechainDB scdb;
extern SidechainDB scdb;

/** Remove extra coinbase(s) from chainActive */
void PruneCoinbaseCache();
Expand Down

0 comments on commit 18a606d

Please sign in to comment.