ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 09:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some files into contracts

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-22 17:18:16 -07:00
parent 3bb61f6f1c
commit 3b801a4433
7 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/ripple_ledger/ripple_ledger.cpp
View File

@@ -29,6 +29,8 @@
#pragma warning (disable: 4244) // conversion, possible loss of data
#endif
#include "ripple_ledger.h"
#include <algorithm>
@@ -38,6 +40,9 @@
#include <openssl/ripemd.h>
#include <openssl/sha.h>
#include <string>
#include <vector>
//#include "uint256.h"
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
@@ -47,6 +52,7 @@
#include <boost/make_shared.hpp>
#include <boost/pointer_cast.hpp>
#include <boost/ref.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>
@@ -54,6 +60,7 @@
#include <boost/unordered_set.hpp>
#include "src/cpp/database/SqliteDatabase.h"
#include "src/cpp/json/writer.h"
#include "src/cpp/ripple/AcceptedLedger.h"
@@ -65,11 +72,9 @@
#include "src/cpp/ripple/CanonicalTXSet.h"
#include "src/cpp/ripple/ChangeTransactor.h"
#include "src/cpp/ripple/Config.h"
#include "src/cpp/ripple/Contract.h"
#include "src/cpp/ripple/FeatureTable.h"
#include "src/cpp/ripple/FieldNames.h"
#include "src/cpp/ripple/HashPrefixes.h"
#include "src/cpp/ripple/Interpreter.h"
#include "src/cpp/ripple/key.h"
#include "src/cpp/ripple/Ledger.h"
#include "src/cpp/ripple/LedgerAcquire.h"
@@ -85,7 +90,6 @@
#include "src/cpp/ripple/Offer.h"
#include "src/cpp/ripple/OfferCancelTransactor.h"
#include "src/cpp/ripple/OfferCreateTransactor.h"
#include "src/cpp/ripple/Operation.h"
#include "src/cpp/ripple/OrderBook.h"
#include "src/cpp/ripple/OrderBookDB.h"
#include "src/cpp/ripple/PackedMessage.h"
@@ -117,8 +121,18 @@
#include "src/cpp/ripple/Wallet.h"
#include "src/cpp/ripple/WalletAddTransactor.h"
// contract stuff, order matters
#include "src/cpp/ripple/ScriptData.h"
#include "src/cpp/ripple/Contract.h"
#include "src/cpp/ripple/Interpreter.h"
#include "src/cpp/ripple/Operation.h"
//------------------------------------------------------------------------------
// contracts
#include "src/cpp/ripple/Contract.cpp" // no log
#include "src/cpp/ripple/Interpreter.cpp" // no log
#include "src/cpp/ripple/ScriptData.cpp" // no log
#include "src/cpp/ripple/Operation.cpp" // no log
// processing

14
newcoin.vcxproj
View File

@@ -660,7 +660,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Interpreter.cpp" />
<ClCompile Include="src\cpp\ripple\Interpreter.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\JobQueue.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -906,7 +911,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ScriptData.cpp" />
<ClCompile Include="src\cpp\ripple\ScriptData.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SerializedLedger.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

24
newcoin.vcxproj.filters
View File

@@ -397,9 +397,6 @@
<ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Interpreter.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\NicknameState.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
@@ -427,9 +424,6 @@
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ScriptData.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\websocket_core.cpp">
<Filter>0. Third Party Code\websocket</Filter>
</ClCompile>
@@ -721,6 +715,12 @@
<ClCompile Include="modules\ripple_net\ripple_net.cpp">
<Filter>1. Modules\ripple_net</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Interpreter.cpp">
<Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ScriptData.cpp">
<Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="database\sqlite3ext.h">
@@ -1023,9 +1023,6 @@
<ClInclude Include="src\cpp\ripple\RippleAddress.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Interpreter.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\KeyCache.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
@@ -1065,9 +1062,6 @@
<ClInclude Include="src\cpp\ripple\ScopedLock.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ScriptData.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SecureAllocator.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
@@ -1359,6 +1353,12 @@
<ClInclude Include="modules\ripple_net\ripple_net.h">
<Filter>1. Modules\ripple_net</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Interpreter.h">
<Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ScriptData.h">
<Filter>1. Modules\ripple_ledger\contracts</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="wallet.xml" />

7
src/cpp/ripple/Contract.h
View File

@@ -1,9 +1,6 @@
#ifndef __CONTRACT__
#define __CONTRACT__
#ifndef CONTRACT_H
#define CONTRACT_H
#include "SerializedLedger.h"
#include <boost/shared_ptr.hpp>
#include "ScriptData.h"
/*
Encapsulates the SLE for a Contract
*/

11
src/cpp/ripple/Interpreter.h
View File

@@ -1,12 +1,5 @@
#ifndef __INTERPRETER__
#define __INTERPRETER__
#include "uint256.h"
#include "Contract.h"
#include <boost/shared_ptr.hpp>
#include <vector>
#include "ScriptData.h"
#include "TransactionEngine.h"
#ifndef INTERPRETER_H
#define INTERPRETER_H
namespace Script {

6
src/cpp/ripple/Operation.h
View File

@@ -1,4 +1,5 @@
#include "Interpreter.h"
#ifndef OPERATION_H
#define OPERATION_H
namespace Script {
@@ -317,4 +318,7 @@ public:
}
#endif
// vim:ts=4

6
src/cpp/ripple/ScriptData.h
View File

@@ -1,7 +1,5 @@
#ifndef __SCRIPT_DATA__
#define __SCRIPT_DATA__
#include "uint256.h"
#include <boost/shared_ptr.hpp>
#ifndef SCRIPT_DATA_H
#define SCRIPT_DATA_H
namespace Script {
class Data