From cbc4212150153c2e4f78fe2ba18dcadf8384c43b Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Mon, 9 Jul 2012 17:37:20 -0700
Subject: [PATCH] Remove transaction transit_set.

---
 src/RPCServer.cpp   | 72 ---------------------------------------------
 src/Transaction.cpp | 37 -----------------------
 src/Transaction.h   | 17 -----------
 src/main.cpp        |  1 -
 4 files changed, 127 deletions(-)

diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp
index 560e1cf845..3c27ac2429 100644
--- a/src/RPCServer.cpp
+++ b/src/RPCServer.cpp
@@ -1294,77 +1294,6 @@ Json::Value RPCServer::doServerInfo(const Json::Value& params)
 	return ret;
 }
 
-// transit_set <seed> <paying_account> <transit_rate> <starts> <expires>
-Json::Value RPCServer::doTransitSet(const Json::Value& params)
-{
-	NewcoinAddress	naSeed;
-	NewcoinAddress	naSrcAccountID;
-	std::string		sTransitRate;
-	std::string		sTransitStart;
-	std::string		sTransitExpire;
-	uint32			uTransitRate;
-	uint32			uTransitStart;
-	uint32			uTransitExpire;
-	uint256			uLedger		= mNetOps->getCurrentLedger();
-
-	if (params.size() >= 6)
-		sTransitRate		= params[6u].asString();
-
-	if (params.size() >= 7)
-		sTransitStart	= params[7u].asString();
-
-	if (params.size() >= 8)
-		sTransitExpire	= params[8u].asString();
-
-	if (!naSeed.setSeedGeneric(params[0u].asString()))
-	{
-		return RPCError(rpcBAD_SEED);
-	}
-	else if (!naSrcAccountID.setAccountID(params[1u].asString()))
-	{
-		return RPCError(rpcSRC_ACT_MALFORMED);
-	}
-	else
-	{
-		NewcoinAddress			naMasterGenerator;
-		NewcoinAddress			naAccountPublic;
-		NewcoinAddress			naAccountPrivate;
-		AccountState::pointer	asSrc;
-		STAmount				saSrcBalance;
-		Json::Value				obj		= authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
-			saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
-
-		if (!obj.empty())
-			return obj;
-
-		uTransitRate		= 0;
-		uTransitStart		= 0;
-		uTransitExpire		= 0;
-
-		Transaction::pointer	trans	= Transaction::sharedTransitSet(
-			naAccountPublic, naAccountPrivate,
-			naSrcAccountID,
-			asSrc->getSeq(),
-			theConfig.FEE_DEFAULT,
-			0,											// YYY No source tag
-			uTransitRate,
-			uTransitStart,
-			uTransitExpire);
-
-		(void) mNetOps->processTransaction(trans);
-
-		obj["transaction"]		= trans->getSTransaction()->getJson(0);
-		obj["status"]			= trans->getStatus();
-		obj["seed"]				= naSeed.humanSeed();
-		obj["srcAccountID"]		= naSrcAccountID.humanAccountID();
-		obj["transitRate"]		= uTransitRate;
-		obj["transitStart"]		= uTransitStart;
-		obj["transitExpire"]	= uTransitExpire;
-
-		return obj;
-	}
-}
-
 Json::Value RPCServer::doTx(const Json::Value& params)
 {
 	// tx <txID>
@@ -2061,7 +1990,6 @@ Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params
 		{	"send",					&RPCServer::doSend,					3, 7, false,	optCurrent	},
 		{	"server_info",			&RPCServer::doServerInfo,			0, 0, true					},
 		{	"stop",					&RPCServer::doStop,					0, 0, true					},
-		{	"transit_set",			&RPCServer::doTransitSet,			5, 5, true,		optCurrent	},
 		{	"tx",					&RPCServer::doTx,					1, 1, true					},
 
 		{	"unl_add",				&RPCServer::doUnlAdd,				1, 2, true					},
diff --git a/src/Transaction.cpp b/src/Transaction.cpp
index 95d4d27720..483cc61043 100644
--- a/src/Transaction.cpp
+++ b/src/Transaction.cpp
@@ -413,43 +413,6 @@ Transaction::pointer Transaction::sharedPayment(
 	return tResult->setPayment(naPrivateKey, naDstAccountID, saAmount, saSendMax, saPaths);
 }
 
-//
-// TransitSet
-//
-
-Transaction::pointer Transaction::setTransitSet(
-	const NewcoinAddress&	naPrivateKey,
-	uint32					uTransitRate,
-	uint32					uTransitStart,
-	uint32					uTransitExpire)
-{
-	if (uTransitRate)
-		mTransaction->setITFieldU32(sfTransitRate, uTransitRate);
-	if (uTransitStart)
-		mTransaction->setITFieldU32(sfTransitStart, uTransitStart);
-	if (uTransitExpire)
-		mTransaction->setITFieldU32(sfTransitExpire, uTransitExpire);
-
-	sign(naPrivateKey);
-
-	return shared_from_this();
-}
-
-Transaction::pointer Transaction::sharedTransitSet(
-	const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-	const NewcoinAddress&	naSourceAccount,
-	uint32					uSeq,
-	const STAmount&			saFee,
-	uint32					uSourceTag,
-	uint32					uTransitRate,
-	uint32					uTransitStart,
-	uint32					uTransitExpire)
-{
-	pointer	tResult	= boost::make_shared<Transaction>(ttTRANSIT_SET, naPublicKey, naSourceAccount, uSeq, saFee, uSourceTag);
-
-	return tResult->setTransitSet(naPrivateKey, uTransitRate, uTransitStart, uTransitExpire);
-}
-
 //
 // WalletAdd
 //
diff --git a/src/Transaction.h b/src/Transaction.h
index 2f34f1b20c..02f2562819 100644
--- a/src/Transaction.h
+++ b/src/Transaction.h
@@ -96,12 +96,6 @@ private:
 		const STAmount&						saSendMax,
 		const STPathSet&					spPaths);
 
-	Transaction::pointer setTransitSet(
-		const NewcoinAddress&				naPrivateKey,
-		uint32								uTransitRate,
-		uint32								uTransitStart,
-		uint32								uTransitExpire);
-
 	Transaction::pointer setWalletAdd(
 		const NewcoinAddress&				naPrivateKey,
 		const STAmount&						saAmount,
@@ -206,17 +200,6 @@ public:
 		const STAmount&						saSendMax,
 		const STPathSet&					saPaths);
 
-	// Set transit fees.
-	static Transaction::pointer sharedTransitSet(
-		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
-		const NewcoinAddress&				naSourceAccount,
-		uint32								uSeq,
-		const STAmount&						saFee,
-		uint32								uSourceTag,
-		uint32								uTransitRate,
-		uint32								uTransitStart,
-		uint32								uTransitExpire);
-
 	// Add an account to a wallet.
 	static Transaction::pointer sharedWalletAdd(
 		const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
diff --git a/src/main.cpp b/src/main.cpp
index aa9e3d7b67..0962728b69 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,7 +57,6 @@ void printHelp(const po::options_description& desc)
 	cout << "     peers" << endl;
 	cout << "     send <seed> <paying_account> <account_id> <amount> [<currency>] [<send_max>] [<send_currency>]" << endl;
 	cout << "     stop" << endl;
-	cout << "     transit_set <seed> <paying_account> <transit_rate> <starts> <expires>" << endl;
 	cout << "     tx <id>" << endl;
 	cout << "     unl_add <domain>|<public> [<comment>]" << endl;
 	cout << "     unl_delete <domain>|<public_key>" << endl;