Merge pull request #5969
f14e687
Chainparams: Decouple CAlert from CChainParams (Jorge Timón)
This commit is contained in:
commit
91cba1aaed
4 changed files with 12 additions and 10 deletions
|
@ -5,7 +5,6 @@
|
|||
|
||||
#include "alert.h"
|
||||
|
||||
#include "chainparams.h"
|
||||
#include "clientversion.h"
|
||||
#include "net.h"
|
||||
#include "pubkey.h"
|
||||
|
@ -145,9 +144,9 @@ bool CAlert::RelayTo(CNode* pnode) const
|
|||
return false;
|
||||
}
|
||||
|
||||
bool CAlert::CheckSignature() const
|
||||
bool CAlert::CheckSignature(const std::vector<unsigned char>& alertKey) const
|
||||
{
|
||||
CPubKey key(Params().AlertKey());
|
||||
CPubKey key(alertKey);
|
||||
if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig))
|
||||
return error("CAlert::CheckSignature(): verify signature failed");
|
||||
|
||||
|
@ -169,9 +168,9 @@ CAlert CAlert::getAlertByHash(const uint256 &hash)
|
|||
return retval;
|
||||
}
|
||||
|
||||
bool CAlert::ProcessAlert(bool fThread)
|
||||
bool CAlert::ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread)
|
||||
{
|
||||
if (!CheckSignature())
|
||||
if (!CheckSignature(alertKey))
|
||||
return false;
|
||||
if (!IsInEffect())
|
||||
return false;
|
||||
|
|
|
@ -100,8 +100,8 @@ public:
|
|||
bool AppliesTo(int nVersion, std::string strSubVerIn) const;
|
||||
bool AppliesToMe() const;
|
||||
bool RelayTo(CNode* pnode) const;
|
||||
bool CheckSignature() const;
|
||||
bool ProcessAlert(bool fThread = true); // fThread means run -alertnotify in a free-running thread
|
||||
bool CheckSignature(const std::vector<unsigned char>& alertKey) const;
|
||||
bool ProcessAlert(const std::vector<unsigned char>& alertKey, bool fThread = true); // fThread means run -alertnotify in a free-running thread
|
||||
static void Notify(const std::string& strMessage, bool fThread);
|
||||
|
||||
/*
|
||||
|
|
|
@ -4270,7 +4270,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
|||
uint256 alertHash = alert.GetHash();
|
||||
if (pfrom->setKnown.count(alertHash) == 0)
|
||||
{
|
||||
if (alert.ProcessAlert())
|
||||
if (alert.ProcessAlert(Params().AlertKey()))
|
||||
{
|
||||
// Relay
|
||||
pfrom->setKnown.insert(alertHash);
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
#include "clientversion.h"
|
||||
#include "data/alertTests.raw.h"
|
||||
|
||||
#include "chainparams.h"
|
||||
#include "serialize.h"
|
||||
#include "streams.h"
|
||||
#include "util.h"
|
||||
|
@ -119,10 +120,11 @@ BOOST_FIXTURE_TEST_SUITE(Alert_tests, ReadAlerts)
|
|||
BOOST_AUTO_TEST_CASE(AlertApplies)
|
||||
{
|
||||
SetMockTime(11);
|
||||
const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
|
||||
|
||||
BOOST_FOREACH(const CAlert& alert, alerts)
|
||||
{
|
||||
BOOST_CHECK(alert.CheckSignature());
|
||||
BOOST_CHECK(alert.CheckSignature(alertKey));
|
||||
}
|
||||
|
||||
BOOST_CHECK(alerts.size() >= 3);
|
||||
|
@ -159,6 +161,7 @@ BOOST_AUTO_TEST_CASE(AlertApplies)
|
|||
BOOST_AUTO_TEST_CASE(AlertNotify)
|
||||
{
|
||||
SetMockTime(11);
|
||||
const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
|
||||
|
||||
boost::filesystem::path temp = GetTempPath() / "alertnotify.txt";
|
||||
boost::filesystem::remove(temp);
|
||||
|
@ -166,7 +169,7 @@ BOOST_AUTO_TEST_CASE(AlertNotify)
|
|||
mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string();
|
||||
|
||||
BOOST_FOREACH(CAlert alert, alerts)
|
||||
alert.ProcessAlert(false);
|
||||
alert.ProcessAlert(alertKey, false);
|
||||
|
||||
std::vector<std::string> r = read_lines(temp);
|
||||
BOOST_CHECK_EQUAL(r.size(), 4u);
|
||||
|
|
Loading…
Reference in a new issue