kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-02-04 19:24:20 +00:00
Code Issues Projects Releases Wiki Activity

Keva undo tests.

Browse Source
This commit is contained in:
Jianping Wu 2018-12-10 21:41:39 -08:00
parent 7f2f9e55b7
commit 37ea895cde
4 changed files with 67 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/keva/main.cpp
View File

@ -344,7 +344,7 @@ CheckKevaTransaction (const CTransaction& tx, unsigned nHeight,
return true; return true;
} }
void ApplyNameTransaction(const CTransaction& tx, unsigned nHeight, void ApplyKevaTransaction(const CTransaction& tx, unsigned nHeight,
CCoinsViewCache& view, CBlockUndo& undo) CCoinsViewCache& view, CBlockUndo& undo)
{ {
assert (nHeight != MEMPOOL_HEIGHT); assert (nHeight != MEMPOOL_HEIGHT);

2
src/keva/main.h
View File

@ -242,7 +242,7 @@ bool CheckKevaTransaction (const CTransaction& tx, unsigned nHeight,
* @param view The chain state to update. * @param view The chain state to update.
* @param undo Record undo information here. * @param undo Record undo information here.
*/ */
void ApplyNameTransaction (const CTransaction& tx, unsigned nHeight, void ApplyKevaTransaction (const CTransaction& tx, unsigned nHeight,
CCoinsViewCache& view, CBlockUndo& undo); CCoinsViewCache& view, CBlockUndo& undo);
/** /**

213
src/test/keva_tests.cpp
View File

@ -33,11 +33,9 @@ BOOST_FIXTURE_TEST_SUITE (keva_tests, TestingSetup)
* Utility function that returns a sample address script to use in the tests. * Utility function that returns a sample address script to use in the tests.
* @return A script that represents a simple address. * @return A script that represents a simple address.
*/ */
static CScript static CScript getTestAddress()
getTestAddress ()
{ {
const CTxDestination dest const CTxDestination dest = DecodeDestination ("VMpwrs7oqLbASU3tbKehhGyvDZ4u3mwR4y");
= DecodeDestination ("VMpwrs7oqLbASU3tbKehhGyvDZ4u3mwR4y");
BOOST_CHECK (IsValidDestination (dest)); BOOST_CHECK (IsValidDestination (dest));
return GetScriptForDestination (dest); return GetScriptForDestination (dest);
@ -47,10 +45,10 @@ getTestAddress ()
BOOST_AUTO_TEST_CASE(keva_scripts) BOOST_AUTO_TEST_CASE(keva_scripts)
{ {
const CScript addr = getTestAddress (); const CScript addr = getTestAddress();
const CKevaScript opNone(addr); const CKevaScript opNone(addr);
BOOST_CHECK (!opNone.isKevaOp ()); BOOST_CHECK (!opNone.isKevaOp());
BOOST_CHECK (opNone.getAddress () == addr); BOOST_CHECK (opNone.getAddress() == addr);
const valtype nameSpace = ValtypeFromString ("namespace-string"); const valtype nameSpace = ValtypeFromString ("namespace-string");
const valtype displayName = ValtypeFromString ("display name"); const valtype displayName = ValtypeFromString ("display name");
@ -699,171 +697,88 @@ BOOST_AUTO_TEST_CASE (name_tx_verification)
BOOST_CHECK (!CheckNameTransaction (mtx, 100012, viewClean, state, 0)); BOOST_CHECK (!CheckNameTransaction (mtx, 100012, viewClean, state, 0));
} }
#endif
/* ************************************************************************** */ /* ************************************************************************** */
BOOST_AUTO_TEST_CASE (name_updates_undo) BOOST_AUTO_TEST_CASE(name_updates_undo)
{ {
/* Enable name history to test this on the go. */ /* Enable name history to test this on the go. */
fNameHistory = true; fNameHistory = true;
const valtype name = ValtypeFromString ("database-test-name"); const valtype nameSpace = ValtypeFromString ("database-test-namespace");
const valtype value1 = ValtypeFromString ("old-value"); const valtype displayName = ValtypeFromString ("display name");
const valtype value2 = ValtypeFromString ("new-value"); const valtype key1 = ValtypeFromString ("key1");
const CScript addr = getTestAddress (); const valtype key2 = ValtypeFromString ("key2");
const valtype value1_old = ValtypeFromString ("old-value_1");
const valtype value1_new = ValtypeFromString ("new-value_1");
const valtype value2_old = ValtypeFromString ("old-value_2");
const valtype value2_new = ValtypeFromString ("new-value_2");
const CScript addr = getTestAddress();
CCoinsView dummyView; CCoinsView dummyView;
CCoinsViewCache view(&dummyView); CCoinsViewCache view(&dummyView);
CBlockUndo undo; CBlockUndo undo;
CNameData data; CKevaData data;
CNameHistory history;
const valtype rand(20, 'x'); const CScript scrNew = CKevaScript::buildKevaNamespace(addr, nameSpace, displayName);
valtype toHash(rand); const CScript scr1_1 = CKevaScript::buildKevaPut(addr, nameSpace, key1, value1_old);
toHash.insert (toHash.end (), name.begin (), name.end ()); const CScript scr1_2 = CKevaScript::buildKevaPut(addr, nameSpace, key1, value1_new);
const uint160 hash = Hash160 (toHash); const CScript scr2_1 = CKevaScript::buildKevaPut(addr, nameSpace, key2, value2_old);
const CScript scr2_2 = CKevaScript::buildKevaPut(addr, nameSpace, key2, value2_new);
const CScript scrNew = CNameScript::buildNameNew (addr, hash);
const CScript scrFirst = CNameScript::buildNameFirstupdate (addr, name,
value1, rand);
const CScript scrUpdate = CNameScript::buildNameUpdate (addr, name, value2);
/* The constructed tx needs not be valid. We only test /* The constructed tx needs not be valid. We only test
ApplyNameTransaction and not validation. */ ApplyKevaTransaction and not validation. */
CMutableTransaction mtx; CMutableTransaction mtx;
mtx.SetNamecoin (); mtx.SetKevacoin();
mtx.vout.push_back (CTxOut (COIN, scrNew)); mtx.vout.push_back(CTxOut(COIN, scrNew));
ApplyNameTransaction (mtx, 100, view, undo); ApplyKevaTransaction(mtx, 100, view, undo);
BOOST_CHECK (!view.GetName (name, data)); BOOST_CHECK(!view.GetName(nameSpace, key1, data));
BOOST_CHECK (undo.vnameundo.empty ()); BOOST_CHECK(view.GetNamespace(nameSpace, data));
BOOST_CHECK (!view.GetNameHistory (name, history)); BOOST_CHECK(undo.vkevaundo.size() == 1);
mtx.vout.clear (); mtx.vout.clear();
mtx.vout.push_back (CTxOut (COIN, scrFirst)); mtx.vout.push_back(CTxOut(COIN, scr1_1));
ApplyNameTransaction (mtx, 200, view, undo); ApplyKevaTransaction(mtx, 200, view, undo);
BOOST_CHECK (view.GetName (name, data)); BOOST_CHECK(view.GetName(nameSpace, key1, data));
BOOST_CHECK (data.getHeight () == 200); BOOST_CHECK(data.getHeight() == 200);
BOOST_CHECK (data.getValue () == value1); BOOST_CHECK(data.getValue() == value1_old);
BOOST_CHECK (data.getAddress () == addr); BOOST_CHECK(data.getAddress() == addr);
BOOST_CHECK (!view.GetNameHistory (name, history)); BOOST_CHECK(undo.vkevaundo.size() == 2);
BOOST_CHECK (undo.vnameundo.size () == 1); const CKevaData firstData = data;
const CNameData firstData = data;
mtx.vout.clear (); mtx.vout.clear();
mtx.vout.push_back (CTxOut (COIN, scrUpdate)); mtx.vout.push_back(CTxOut(COIN, scr1_2));
ApplyNameTransaction (mtx, 300, view, undo); ApplyKevaTransaction(mtx, 300, view, undo);
BOOST_CHECK (view.GetName (name, data)); BOOST_CHECK(view.GetName(nameSpace, key1, data));
BOOST_CHECK (data.getHeight () == 300); BOOST_CHECK(data.getHeight() == 300);
BOOST_CHECK (data.getValue () == value2); BOOST_CHECK(data.getValue() == value1_new);
BOOST_CHECK (data.getAddress () == addr); BOOST_CHECK(data.getAddress() == addr);
BOOST_CHECK (view.GetNameHistory (name, history)); BOOST_CHECK(undo.vkevaundo.size() == 3);
BOOST_CHECK (history.getData ().size () == 1);
BOOST_CHECK (history.getData ().back () == firstData);
BOOST_CHECK (undo.vnameundo.size () == 2);
undo.vnameundo.back ().apply (view); undo.vkevaundo.back().apply(view);
BOOST_CHECK (view.GetName (name, data)); BOOST_CHECK(view.GetName(nameSpace, key1, data));
BOOST_CHECK (data.getHeight () == 200); BOOST_CHECK(data.getHeight() == 200);
BOOST_CHECK (data.getValue () == value1); BOOST_CHECK(data.getValue() == value1_old);
BOOST_CHECK (data.getAddress () == addr); BOOST_CHECK(data.getAddress() == addr);
BOOST_CHECK (!view.GetNameHistory (name, history) || history.empty ()); undo.vkevaundo.pop_back();
undo.vnameundo.pop_back ();
undo.vnameundo.back ().apply (view); undo.vkevaundo.back().apply(view);
BOOST_CHECK (!view.GetName (name, data)); BOOST_CHECK(!view.GetName(nameSpace, key1, data));
BOOST_CHECK (!view.GetNameHistory (name, history) || history.empty ()); BOOST_CHECK(view.GetNamespace(nameSpace, data));
undo.vnameundo.pop_back (); undo.vkevaundo.pop_back();
BOOST_CHECK (undo.vnameundo.empty ());
undo.vkevaundo.back().apply(view);
BOOST_CHECK(!view.GetNamespace(nameSpace, data));
undo.vkevaundo.pop_back();
BOOST_CHECK(undo.vkevaundo.empty());
} }
/* ************************************************************************** */ /* ************************************************************************** */
#if 0
BOOST_AUTO_TEST_CASE (name_expire_utxo)
{
const valtype name1 = ValtypeFromString ("test-name-1");
const valtype name2 = ValtypeFromString ("test-name-2");
const valtype value = ValtypeFromString ("value");
const CScript addr = getTestAddress ();
const CScript upd1 = CNameScript::buildNameUpdate (addr, name1, value);
const CScript upd2 = CNameScript::buildNameUpdate (addr, name2, value);
const CNameScript op1(upd1);
const CNameScript op2(upd2);
/* Use a "real" backing view, since GetNamesForHeight calls through
to the base in any case. */
CCoinsViewCache view(pcoinsTip.get());
const COutPoint coinId1 = addTestCoin (upd1, 100000, view);
const COutPoint coinId2 = addTestCoin (upd2, 100010, view);
CNameData data;
data.fromScript (100000, coinId1, op1);
view.SetName (name1, data, false);
BOOST_CHECK (!data.isExpired (135999) && data.isExpired (136000));
data.fromScript (100010, coinId2, op2);
view.SetName (name2, data, false);
BOOST_CHECK (!data.isExpired (136009) && data.isExpired (136010));
std::set<valtype> setExpired;
BOOST_CHECK (view.GetNamesForHeight (100000, setExpired));
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name1);
BOOST_CHECK (view.GetNamesForHeight (100010, setExpired));
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name2);
Coin coin1, coin2;
BOOST_CHECK (view.GetCoin (coinId1, coin1));
BOOST_CHECK (view.GetCoin (coinId2, coin2));
CBlockUndo undo1, undo2;
Coin coin;
/* None of the two names should be expired. */
BOOST_CHECK (ExpireNames (135999, view, undo1, setExpired));
BOOST_CHECK (undo1.vexpired.empty ());
BOOST_CHECK (setExpired.empty ());
BOOST_CHECK (view.GetCoin (coinId1, coin));
BOOST_CHECK (coin == coin1);
BOOST_CHECK (view.GetCoin (coinId2, coin));
BOOST_CHECK (coin == coin2);
/* The first name expires. */
BOOST_CHECK (ExpireNames (136000, view, undo1, setExpired));
BOOST_CHECK (undo1.vexpired.size () == 1);
BOOST_CHECK (undo1.vexpired[0] == coin1);
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name1);
BOOST_CHECK (!view.GetCoin (coinId1, coin));
BOOST_CHECK (view.GetCoin (coinId2, coin));
BOOST_CHECK (coin == coin2);
/* Also the second name expires. */
BOOST_CHECK (ExpireNames (136010, view, undo2, setExpired));
BOOST_CHECK (undo2.vexpired.size () == 1);
BOOST_CHECK (undo2.vexpired[0] == coin2);
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name2);
BOOST_CHECK (!view.GetCoin (coinId1, coin));
BOOST_CHECK (!view.GetCoin (coinId2, coin));
/* Undo the second expiration. */
BOOST_CHECK (UnexpireNames (136010, undo2, view, setExpired));
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name2);
BOOST_CHECK (!view.GetCoin (coinId1, coin));
BOOST_CHECK (view.GetCoin (coinId2, coin));
BOOST_CHECK (coin == coin2);
/* Undoing at the wrong height should fail. */
BOOST_CHECK (!UnexpireNames (136001, undo1, view, setExpired));
BOOST_CHECK (!UnexpireNames (135999, undo1, view, setExpired));
/* Undo the first expiration. */
BOOST_CHECK (UnexpireNames (136000, undo1, view, setExpired));
BOOST_CHECK (setExpired.size () == 1 && *setExpired.begin () == name1);
BOOST_CHECK (view.GetCoin (coinId1, coin));
BOOST_CHECK (coin == coin1);
BOOST_CHECK (view.GetCoin (coinId2, coin));
BOOST_CHECK (coin == coin2);
}
/* ************************************************************************** */ /* ************************************************************************** */

2
src/validation.cpp
View File

@ -2017,7 +2017,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
blockundo.vtxundo.push_back(CTxUndo()); blockundo.vtxundo.push_back(CTxUndo());
} }
UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight); UpdateCoins(tx, view, i == 0 ? undoDummy : blockundo.vtxundo.back(), pindex->nHeight);
ApplyNameTransaction(tx, pindex->nHeight, view, blockundo); ApplyKevaTransaction(tx, pindex->nHeight, view, blockundo);
} }
int64_t nTime3 = GetTimeMicros(); nTimeConnect += nTime3 - nTime2; int64_t nTime3 = GetTimeMicros(); nTimeConnect += nTime3 - nTime2;
LogPrint(BCLog::BENCH, " - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs (%.2fms/blk)]\n", (unsigned)block.vtx.size(), MILLI * (nTime3 - nTime2), MILLI * (nTime3 - nTime2) / block.vtx.size(), nInputs <= 1 ? 0 : MILLI * (nTime3 - nTime2) / (nInputs-1), nTimeConnect * MICRO, nTimeConnect * MILLI / nBlocksTotal); LogPrint(BCLog::BENCH, " - Connect %u transactions: %.2fms (%.3fms/tx, %.3fms/txin) [%.2fs (%.2fms/blk)]\n", (unsigned)block.vtx.size(), MILLI * (nTime3 - nTime2), MILLI * (nTime3 - nTime2) / block.vtx.size(), nInputs <= 1 ? 0 : MILLI * (nTime3 - nTime2) / (nInputs-1), nTimeConnect * MICRO, nTimeConnect * MILLI / nBlocksTotal);