Skip to content

Update getassetdata network call to use correct cache #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blondfrogs merged 1 commit into from
Nov 21, 2018
Merged

Update getassetdata network call to use correct cache #453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,15 +1209,11 @@ void static ProcessAssetGetData(CNode* pfrom, const Consensus::Params& consensus
}

bool push = false;
if (passetsCache && passetsCache->Exists(inv.name)) {
auto data = passetsCache->Get(inv.name);
connman->PushMessage(pfrom, msgMaker.Make(NetMsgType::ASSETDATA, SerializedAssetData(data)));
push = true;
} else if (passetsdb) {
if (passets) {
CNewAsset asset;
int height;
uint256 hash;
if (passetsdb->ReadAssetData(inv.name, asset, height, hash)) {
if (passets->GetAssetMetaDataIfExists(inv.name, asset, height, hash)) {
auto data = CDatabasedAssetData(asset, height, hash);
passetsCache->Put(inv.name, data);
connman->PushMessage(pfrom, msgMaker.Make(NetMsgType::ASSETDATA, SerializedAssetData(data)));
Expand Down Expand Up @@ -1688,7 +1684,6 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
}
}


else if (strCommand == NetMsgType::GETDATA)
{
std::vector<CInv> vInv;
Expand Down Expand Up @@ -3116,7 +3111,6 @@ bool PeerLogicValidation::SendMessages(CNode* pto, std::atomic<bool>& interruptM
// Message: getassetdata
//
if (pto->nVersion >= ASSETDATA_VERSION && pto->fGetAssetData) {
LogPrintf("Got to getassetdata net_processing\n");
LOCK(pto->cs_inventory);

pto->fGetAssetData = false;
Expand Down