mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
strip out unfinished product, review and market stuff,
enable _() instead of wxT() in uiproject.fbp so it uses wxGetTranslation for the wxFormBuilder generated part of the UI git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@64 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
24
main.cpp
24
main.cpp
@@ -1706,10 +1706,8 @@ bool AlreadyHave(CTxDB& txdb, const CInv& inv)
|
||||
{
|
||||
switch (inv.type)
|
||||
{
|
||||
case MSG_TX: return mapTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash);
|
||||
case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash);
|
||||
case MSG_REVIEW: return true;
|
||||
case MSG_PRODUCT: return mapProducts.count(inv.hash);
|
||||
case MSG_TX: return mapTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash);
|
||||
case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash);
|
||||
}
|
||||
// Don't know what it is, just say we already got one
|
||||
return true;
|
||||
@@ -2108,24 +2106,6 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
||||
}
|
||||
|
||||
|
||||
else if (strCommand == "review")
|
||||
{
|
||||
CDataStream vMsg(vRecv);
|
||||
CReview review;
|
||||
vRecv >> review;
|
||||
|
||||
CInv inv(MSG_REVIEW, review.GetHash());
|
||||
pfrom->AddInventoryKnown(inv);
|
||||
|
||||
if (review.AcceptReview())
|
||||
{
|
||||
// Relay the original message as-is in case it's a higher version than we know how to parse
|
||||
RelayMessage(inv, vMsg);
|
||||
mapAlreadyAskedFor.erase(inv);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
else if (strCommand == "block")
|
||||
{
|
||||
auto_ptr<CBlock> pblock(new CBlock);
|
||||
|
||||
Reference in New Issue
Block a user