From 1d95d8f36c55034070a2e0dd4d434543fda14b80 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 30 May 2013 14:57:27 -0700
Subject: [PATCH] Clean up addition of initial features.

---
 src/cpp/ripple/FeatureTable.cpp | 24 ++++++++++++++++++++++--
 src/cpp/ripple/FeatureTable.h   |  2 ++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/cpp/ripple/FeatureTable.cpp b/src/cpp/ripple/FeatureTable.cpp
index 0fa2e2755..686a34df6 100644
--- a/src/cpp/ripple/FeatureTable.cpp
+++ b/src/cpp/ripple/FeatureTable.cpp
@@ -8,8 +8,7 @@ void FeatureTable::addInitialFeatures()
 	// For each feature this version supports, construct the FeatureState object by calling
 	// getCreateFeature. Set any vetoes or defaults. A pointer to the FeatureState can be stashed
 
-	testFeature = getCreateFeature(uint256("1234"), true);
-	testFeature->setFriendlyName("testFeature");
+	testFeature = addKnownFeature("1234", "testFeature", false);
 }
 
 FeatureState* FeatureTable::getCreateFeature(const uint256& featureHash, bool create)
@@ -41,6 +40,26 @@ FeatureState* FeatureTable::getCreateFeature(const uint256& featureHash, bool cr
 	return &(it->second);
 }
 
+FeatureState* FeatureTable::addKnownFeature(const char *featureID, const char *friendlyName, bool veto)
+{
+	uint256 hash;
+	hash.SetHex(featureID);
+	if (hash.isZero())
+	{
+		assert(false);
+		return NULL;
+	}
+	FeatureState* f = getCreateFeature(hash, true);
+
+	if (friendlyName != NULL)
+		f->setFriendlyName(friendlyName);
+
+	f->mVetoed = veto;
+	f->mSupported = true;
+
+	return f;
+}
+
 bool FeatureTable::vetoFeature(const uint256& feature)
 {
 	boost::mutex::scoped_lock sl(mMutex);
@@ -304,6 +323,7 @@ Json::Value FeatureTable::getJson(int)
 				v["name"] = it.second.mFriendlyName;
 
 			v["supported"] = it.second.mSupported;
+			v["vetoed"] = it.second.mVetoed;
 
 			if (it.second.mEnabled)
 				v["enabled"] = true;
diff --git a/src/cpp/ripple/FeatureTable.h b/src/cpp/ripple/FeatureTable.h
index 020238678..623100b7e 100644
--- a/src/cpp/ripple/FeatureTable.h
+++ b/src/cpp/ripple/FeatureTable.h
@@ -72,6 +72,8 @@ public:
 
 	void addInitialFeatures();
 
+	FeatureState* addKnownFeature(const char *featureID, const char *friendlyName, bool veto);
+
 	bool vetoFeature(const uint256& feature);
 	bool unVetoFeature(const uint256& feature);