Strip includes

src/cpp/database/SqliteDatabase.cpp

@@ -4,21 +4,37 @@
 */
 //==============================================================================
 
-#include "SqliteDatabase.h"
-#include "sqlite3.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <iostream>
-
-#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
-#include <boost/bind.hpp>
-
 SETUP_LOG (SqliteDatabase)
 
 using namespace std;
 
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
+{
+    assert (db);
+
+    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
+    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
+
+    if (j != SQLITE_OK)
+        throw j;
+}
+
+SqliteStatement::~SqliteStatement ()
+{
+    sqlite3_finalize (statement);
+}
+
 SqliteDatabase::SqliteDatabase (const char* host) : Database (host, "", ""), mWalQ (NULL), walRunning (false)
 {
     mConnection     = NULL;
@@ -298,33 +314,6 @@ void SqliteDatabase::runWal ()
     }
 }
 
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql, strlen (sql) + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::SqliteStatement (SqliteDatabase* db, const std::string& sql, bool aux)
-{
-    assert (db);
-
-    sqlite3* conn = aux ? db->getAuxConnection () : db->peekConnection ();
-    int j = sqlite3_prepare_v2 (conn, sql.c_str (), sql.size () + 1, &statement, NULL);
-
-    if (j != SQLITE_OK)
-        throw j;
-}
-
-SqliteStatement::~SqliteStatement ()
-{
-    sqlite3_finalize (statement);
-}
-
 sqlite3_stmt* SqliteStatement::peekStatement ()
 {
     return statement;

src/cpp/database/SqliteDatabase.h

@@ -13,7 +13,7 @@ struct sqlite3_stmt;
 class SqliteDatabase : public Database
 {
 public:
-    SqliteDatabase (const char* host);
+    explicit SqliteDatabase (char const* host);
 
     void connect ();
     void disconnect ();
@@ -61,6 +61,7 @@ public:
 
 private:
     sqlite3* mConnection;
+    // VFALCO TODO Why do we need an "aux" connection? Should just use a second SqliteDatabase object.
     sqlite3* mAuxConnection;
     sqlite3_stmt* mCurrentStmt;
     bool mMoreRows;
@@ -80,6 +81,9 @@ protected:
     sqlite3_stmt* statement;
 
 public:
+    // VFALCO TODO This is quite a convoluted interface. A mysterious "aux" connection? 
+    //             Why not just have two SqliteDatabase objects?
+    //
     SqliteStatement (SqliteDatabase* db, const char* statement, bool aux = false);
     SqliteStatement (SqliteDatabase* db, const std::string& statement, bool aux = false);
     ~SqliteStatement ();

src/cpp/database/database.cpp

@@ -4,10 +4,6 @@
 */
 //==============================================================================
 
-#include "database.h"
-#include <stdlib.h>
-#include <string.h>
-
 Database::Database (const char* host, const char* user, const char* pass) : mNumCol (0)
 {
     mDBPass = pass;

src/cpp/ripple/AutoSocket.h

@@ -7,17 +7,6 @@
 #ifndef __AUTOSOCKET_H_
 #define __AUTOSOCKET_H_
 
-#include <vector>
-#include <string>
-
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/asio/read_until.hpp>
-
 extern LogPartition AutoSocketPartition;
 
 // Socket wrapper that supports both SSL and non-SSL connections.

src/cpp/ripple/CallRPC.cpp

@@ -11,26 +11,6 @@
 // Improvements to be more strict and to provide better diagnostics are welcome.
 //
 
-#include <iostream>
-#include <cstdlib>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/bind.hpp>
-#include <boost/iostreams/concepts.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-#include <boost/regex.hpp>
-
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-#include "RPC.h"
-#include "RPCErr.h"
-
-#include "CallRPC.h"
-
 SETUP_LOG (RPCParser)
 
 static inline bool isSwitchChar (char c)

src/cpp/ripple/CallRPC.h

@@ -7,8 +7,6 @@
 #ifndef __CALLRPC__
 #define __CALLRPC__
 
-#include <string>
-
 class RPCParser
 {
 public:

src/cpp/ripple/ChangeTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (ChangeTransactor)
 
 TER ChangeTransactor::doApply ()

src/cpp/ripple/ChangeTransactor.h

@@ -4,8 +4,6 @@
 */
 //==============================================================================
 
-#include "Transactor.h"
-
 class ChangeTransactor : public Transactor
 {
 public:

src/cpp/ripple/Contract.cpp

@@ -4,11 +4,6 @@
 */
 //==============================================================================
 
-using namespace Script;
-/*
-JED: V III
-*/
-
 Contract::Contract ()
 {
 

src/cpp/ripple/DBInit.cpp

@@ -4,8 +4,6 @@
 */
 //==============================================================================
 
-#include <string>
-
 // Transaction database holds transactions and public keys
 const char* TxnDBInit[] =
 {

src/cpp/ripple/HTTPRequest.cpp

@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include "HTTPRequest.h"
-
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
 SETUP_LOG (HTTPRequest)
 
 // Logic to handle incoming HTTP reqests

src/cpp/ripple/HTTPRequest.h

@@ -7,11 +7,6 @@
 #ifndef HTTPREQUEST__HPP
 #define HTTPREQUEST__HPP
 
-#include <string>
-#include <map>
-
-#include <boost/asio/streambuf.hpp>
-
 enum HTTPRequestAction
 {
     // What the application code needs to do

src/cpp/ripple/HttpsClient.h

@@ -7,17 +7,6 @@
 #ifndef _HTTPS_CLIENT_
 #define _HTTPS_CLIENT_
 
-#include <deque>
-#include <string>
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include "AutoSocket.h"
-
 //
 // Async https client.
 //

src/cpp/ripple/Interpreter.cpp

@@ -4,9 +4,6 @@
 */
 //==============================================================================
 
-#include "Interpreter.h"
-#include "Operation.h"
-
 /*
 We also need to charge for each op
 

src/cpp/ripple/OfferCancelTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (OfferCancelTransactor)
 
 TER OfferCancelTransactor::doApply ()

src/cpp/ripple/OfferCancelTransactor.h

@@ -7,8 +7,6 @@
 #ifndef OFFERCANCELTRANSACTOR_H
 #define OFFERCANCELTRANSACTOR_H
 
-#include "Transactor.h"
-
 class OfferCancelTransactor : public Transactor
 {
 public:

src/cpp/ripple/OfferCreateTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (OfferCreateTransactor)
 
 // Make sure an offer is still valid. If not, mark it unfunded.

src/cpp/ripple/OfferCreateTransactor.h

@@ -7,8 +7,6 @@
 #ifndef __OFFERCREATETRANSACTOR__
 #define __OFFERCREATETRANSACTOR__
 
-#include "Transactor.h"
-
 class OfferCreateTransactor : public Transactor
 {
 public:

src/cpp/ripple/ParameterTable.cpp

@@ -4,11 +4,6 @@
 */
 //==============================================================================
 
-#include "ParameterTable.h"
-
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
-
 bool ParameterNode::setValue (const std::string& name, const Json::Value& value, Json::Value& error)
 {
     if (name.empty ()) // this node

src/cpp/ripple/ParseSection.cpp

@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include "ParseSection.h"
-
-#include <iostream>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
 #define SECTION_DEFAULT_NAME    ""
 
 // for logging

src/cpp/ripple/ParseSection.h

@@ -7,10 +7,6 @@
 #ifndef _PARSE_SECTION_
 #define _PARSE_SECTION_
 
-#include <map>
-#include <vector>
-#include <string>
-
 typedef std::map<const std::string, std::vector<std::string> > section;
 
 section ParseSection (const std::string& strInput, const bool bTrim);

src/cpp/ripple/PaymentTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (PaymentTransactor)
 
 #define RIPPLE_PATHS_MAX    6

src/cpp/ripple/PaymentTransactor.h

@@ -7,8 +7,6 @@
 #ifndef __PAYMENTTRANSACTOR__
 #define __PAYMENTTRANSACTOR__
 
-#include "Transactor.h"
-
 class PaymentTransactor : public Transactor
 {
 public:

src/cpp/ripple/PeerDoor.h

@@ -7,9 +7,6 @@
 #ifndef __PEERDOOR__
 #define __PEERDOOR__
 
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-
 /*
 Handles incoming connections from other Peers
 */

src/cpp/ripple/RPC.h

@@ -7,9 +7,6 @@
 #ifndef __RPC_h__
 #define __RPC_h__
 
-#include <string>
-#include <map>
-
 enum http_status_type
 {
     ok = 200,

src/cpp/ripple/RPCDoor.cpp

@@ -4,10 +4,6 @@
 */
 //==============================================================================
 
-#include "RPCDoor.h"
-#include <boost/bind.hpp>
-#include <iostream>
-
 SETUP_LOG (RPCDoor)
 
 using namespace std;

src/cpp/ripple/RPCDoor.h

@@ -7,8 +7,6 @@
 #ifndef RIPPLE_RPCDOOR_H
 #define RIPPLE_RPCDOOR_H
 
-#include "RPCServer.h"
-
 /*
 Handles incoming connections from people making RPC Requests
 */

src/cpp/ripple/RPCErr.cpp

@@ -4,9 +4,6 @@
 */
 //==============================================================================
 
-
-#include "RPCErr.h"
-
 // For logging
 struct RPCErr { };
 

src/cpp/ripple/RPCHandler.h

@@ -7,10 +7,6 @@
 #ifndef __RPCHANDLER__
 #define __RPCHANDLER__
 
-#include <boost/unordered_set.hpp>
-
-#include "Ledger.h"
-
 #define LEDGER_CURRENT      -1
 #define LEDGER_CLOSED       -2
 #define LEDGER_VALIDATED    -3

src/cpp/ripple/RPCServer.cpp

@@ -4,20 +4,6 @@
 */
 //==============================================================================
 
-#include "RPCServer.h"
-
-#include "HttpsClient.h"
-#include "RPC.h"
-
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/asio/read_until.hpp>
-
 #ifndef RPC_MAXIMUM_QUERY
 #define RPC_MAXIMUM_QUERY   (1024*1024)
 #endif

src/cpp/ripple/RPCServer.h

@@ -7,9 +7,6 @@
 #ifndef __RPCSERVER__
 #define __RPCSERVER__
 
-#include "HTTPRequest.h"
-#include "RPCHandler.h"
-
 class RPCServer : public boost::enable_shared_from_this<RPCServer>
 {
 public:

src/cpp/ripple/RPCSub.cpp

@@ -4,12 +4,6 @@
 */
 //==============================================================================
 
-#include <boost/thread.hpp>
-
-#include "RPCSub.h"
-
-#include "CallRPC.h"
-
 SETUP_LOG (RPCSub)
 
 RPCSub::RPCSub (const std::string& strUrl, const std::string& strUsername, const std::string& strPassword)

src/cpp/ripple/RegularKeySetTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (RegularKeySetTransactor)
 
 uint64 RegularKeySetTransactor::calculateBaseFee ()

src/cpp/ripple/RegularKeySetTransactor.h

@@ -7,8 +7,6 @@
 #ifndef REGULARKEYSETTRANSACTOR_H
 #define REGULARKEYSETTRANSACTOR_H
 
-#include "Transactor.h"
-
 class RegularKeySetTransactor : public Transactor
 {
     uint64 calculateBaseFee ();

src/cpp/ripple/SNTPClient.cpp

@@ -4,14 +4,6 @@
 */
 //==============================================================================
 
-#include "SNTPClient.h"
-
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
-
-#include <openssl/rand.h>
-
 SETUP_LOG (SNTPClient)
 
 // #define SNTP_DEBUG

src/cpp/ripple/SNTPClient.h

@@ -7,14 +7,6 @@
 #ifndef __SNTPCLIENT__
 #define __SNTPCLIENT__
 
-#include <string>
-#include <map>
-#include <vector>
-#include <list>
-
-#include <boost/thread/mutex.hpp>
-#include <boost/asio.hpp>
-
 class SNTPQuery
 {
 public:

src/cpp/ripple/ScriptData.cpp

@@ -3,7 +3,3 @@
     Copyright (c) 2011-2013, OpenCoin, Inc.
 */
 //==============================================================================
-
-#include "ScriptData.h"
-
-// vim:ts=4

src/cpp/ripple/TransactionMaster.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 #ifndef CACHED_TRANSACTION_NUM
 #define CACHED_TRANSACTION_NUM 65536
 #endif

src/cpp/ripple/TransactionMaster.h

@@ -7,8 +7,6 @@
 #ifndef __TRANSACTIONMASTER__
 #define __TRANSACTIONMASTER__
 
-#include "Transaction.h"
-
 // Tracks all transactions in memory
 
 class TransactionMaster

src/cpp/ripple/TransactionMeta.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 // VFALCO TODO rename class to TransactionMeta
 
 SETUP_LOG (TransactionMetaSet)

src/cpp/ripple/TransactionQueue.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 void TXQEntry::addCallbacks (const TXQEntry& otherEntry)
 {
     BOOST_FOREACH (const stCallback & callback, otherEntry.mCallbacks)

src/cpp/ripple/TransactionQueue.h

@@ -9,15 +9,6 @@
 
 // Allow transactions to be signature checked out of sequence but retired in sequence
 
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/bimap.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
-#include <boost/bimap/list_of.hpp>
-
-#include "Transaction.h"
-
 class TXQeueue;
 
 class TXQEntry

src/cpp/ripple/Transactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (Transactor)
 
 UPTR_T<Transactor> Transactor::makeTransactor (const SerializedTransaction& txn, TransactionEngineParams params, TransactionEngine* engine)

src/cpp/ripple/Transactor.h

@@ -7,8 +7,6 @@
 #ifndef __TRANSACTOR__
 #define __TRANSACTOR__
 
-#include "TransactionEngine.h"
-
 class Transactor
 {
 public:

src/cpp/ripple/TrustSetTransactor.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 SETUP_LOG (TrustSetTransactor)
 
 TER TrustSetTransactor::doApply ()

src/cpp/ripple/TrustSetTransactor.h

@@ -7,8 +7,6 @@
 #ifndef TRUSTSETTRANSACTOR_H
 #define TRUSTSETTRANSACTOR_H
 
-#include "Transactor.h"
-
 class TrustSetTransactor : public Transactor
 {
 public:

src/cpp/ripple/WSConnection.h

@@ -8,9 +8,6 @@
 #ifndef RIPPLE_WSCONNECTION_H
 #define RIPPLE_WSCONNECTION_H
 
-#include "../websocketpp/src/sockets/autotls.hpp"
-#include "../websocketpp/src/websocketpp.hpp"
-
 // This is for logging
 struct WSConnectionLog;
 

src/cpp/ripple/WSDoor.cpp

@@ -4,24 +4,6 @@
 */
 //==============================================================================
 
-
-
-//#define WSDOOR_CPP
-//#include "../websocketpp/src/sockets/autotls.hpp"
-//#include "../websocketpp/src/websocketpp.hpp"
-
-#include "WSConnection.h"
-#include "WSHandler.h"
-
-#include "WSDoor.h"
-
-#include <iostream>
-
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#include <boost/mem_fn.hpp>
-#include <boost/unordered_set.hpp>
-
 SETUP_LOG (WSDoor)
 
 //

src/cpp/ripple/WSDoor.h

@@ -4,29 +4,8 @@
 */
 //==============================================================================
 
-#ifndef __WSDOOR__
-#define __WSDOOR__
-
-#include <boost/asio.hpp>
-#include <boost/asio/ssl.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-
-#include "../websocketpp/src/sockets/autotls.hpp"
-#include "../websocketpp/src/websocketpp.hpp"
-
-/*
-#ifndef WSDOOR_CPP
-
-namespace websocketpp
-{
-    class server;
-    class server_autotls;
-}
-
-#endif
-*/
+#ifndef RIPPLE_WSDOOR_RIPPLEHEADER
+#define RIPPLE_WSDOOR_RIPPLEHEADER
 
 class WSDoor
 {

src/cpp/ripple/main.cpp

@@ -4,7 +4,6 @@
 */
 //==============================================================================
 
-
 namespace po = boost::program_options;
 
 // VFALCO TODO make these singletons that initialize statically

src/cpp/ripple/ripple_HashedObjectStore.cpp

@@ -303,6 +303,10 @@ void HashedObjectStore::bulkWriteSQLite (Job&)
 
         {
             Database* db = theApp->getHashNodeDB ()->getDB ();
+
+
+            // VFALCO TODO Get rid of the last parameter "aux", which is set to !theConfig.RUN_STANDALONE
+            //
             static SqliteStatement pStB (db->getSqliteDB (), "BEGIN TRANSACTION;", !theConfig.RUN_STANDALONE);
             static SqliteStatement pStE (db->getSqliteDB (), "END TRANSACTION;", !theConfig.RUN_STANDALONE);
             static SqliteStatement pSt (db->getSqliteDB (),

src/cpp/ripple/rpc.cpp

@@ -4,18 +4,6 @@
 */
 //==============================================================================
 
-
-#include <boost/asio.hpp>
-#include <boost/iostreams/concepts.hpp>
-#include <boost/iostreams/stream.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-#include "RPC.h"
-
 // Used for logging
 struct RPC
 {