Skip to content

Commit

Permalink
renamed getUpgrades into getUpgradesJson
Browse files Browse the repository at this point in the history
  • Loading branch information
MonsieurNicolas committed Dec 20, 2017
1 parent 55d68a1 commit ab42d2f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/herder/Herder.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class Herder
// sets the upgrades that should be applied during consensus
virtual void setUpgrades(Upgrades::UpgradeParameters const& upgrades) = 0;
// gets the upgrades that are scheduled by this node
virtual std::string getUpgrades() = 0;
virtual std::string getUpgradesJson() = 0;

virtual ~Herder()
{
Expand Down
2 changes: 1 addition & 1 deletion src/herder/HerderImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ HerderImpl::setUpgrades(Upgrades::UpgradeParameters const& upgrades)
}

std::string
HerderImpl::getUpgrades()
HerderImpl::getUpgradesJson()
{
return mUpgrades.getParameters().toJson();
}
Expand Down
2 changes: 1 addition & 1 deletion src/herder/HerderImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class HerderImpl : public Herder
void triggerNextLedger(uint32_t ledgerSeqToTrigger) override;

void setUpgrades(Upgrades::UpgradeParameters const& upgrades) override;
std::string getUpgrades() override;
std::string getUpgradesJson() override;

bool resolveNodeID(std::string const& s, PublicKey& retKey) override;

Expand Down
2 changes: 1 addition & 1 deletion src/main/CommandHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ CommandHandler::upgrades(std::string const& params, std::string& retStr)
}
if (s == "get")
{
retStr = mApp.getHerder().getUpgrades();
retStr = mApp.getHerder().getUpgradesJson();
}
else if (s == "set")
{
Expand Down

5 comments on commit ab42d2f

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from MonsieurNicolas
at MonsieurNicolas@ab42d2f

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging MonsieurNicolas/stellar-core/upgradeImprovementsSingleShot = ab42d2f into auto

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MonsieurNicolas/stellar-core/upgradeImprovementsSingleShot = ab42d2f merged ok, testing candidate = 7ad53a5

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@latobarita
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 7ad53a5

Please sign in to comment.