X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Falert.cpp;h=25186673e0fe6feffb3e3c8888fd4c03be55b5bb;hb=fd3035cd568a2a8d3017845d9eed7fc0daeaa2e7;hp=4a0a64be86fe53ab7bcb2f0d5bf172e43f88d603;hpb=d008ea3376606276a86ed3c972654363eb23f47d;p=novacoin.git diff --git a/src/alert.cpp b/src/alert.cpp index 4a0a64b..2518667 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -9,7 +9,7 @@ #include "key.h" #include "net.h" #include "sync.h" -#include "ui_interface.h" +#include "interface.h" using namespace std; @@ -53,8 +53,8 @@ std::string CUnsignedAlert::ToString() const return strprintf( "CAlert(\n" " nVersion = %d\n" - " nRelayUntil = %" PRI64d "\n" - " nExpiration = %" PRI64d "\n" + " nRelayUntil = %" PRId64 "\n" + " nExpiration = %" PRId64 "\n" " nID = %d\n" " nCancel = %d\n" " setCancel = %s\n" @@ -79,11 +79,6 @@ std::string CUnsignedAlert::ToString() const strStatusBar.c_str()); } -void CUnsignedAlert::print() const -{ - printf("%s", ToString().c_str()); -} - void CAlert::SetNull() { CUnsignedAlert::SetNull(); @@ -149,9 +144,8 @@ bool CAlert::RelayTo(CNode* pnode) const bool CAlert::CheckSignature() const { - CKey key; - if (!key.SetPubKey(ParseHex(fTestNet ? pszTestKey : pszMainKey))) - return error("CAlert::CheckSignature() : SetPubKey failed"); + CPubKey key; + key.Set(ParseHex(fTestNet ? pszTestKey : pszMainKey)); if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig)) return error("CAlert::CheckSignature() : verify signature failed");