put streams togeterh

vigcoin · Oct 18, 2018 · 63a5d23 · 63a5d23
1 parent 18746f7
commit 63a5d23
Show file tree

Hide file tree

Showing 54 changed files with 74 additions and 60 deletions.
diff --git a/replace.sh b/replace.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+echo "$1"
+echo "$2"
+
+if [ -z "$1" ] || [ -z "$2" ]; then
+echo "please input both replacee and replacer"
+else
+
+find ./src/ -type f -exec sed -i "s/$1/$2/g" {} +
+find ./include/ -type f -exec sed -i "s/$1/$2/g" {} +
+find ./tests/ -type f -exec sed -i "s/$1/$2/g" {} +
+fi
+
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_definitions(-DSTATICLIB)
 
 file(GLOB_RECURSE BlockchainExplorer BlockchainExplorer/*)
-file(GLOB_RECURSE Common common/*)
+file(GLOB_RECURSE Common common/* stream/*)
 file(GLOB_RECURSE ConnectivityTool ConnectivityTool/*)
 file(GLOB_RECURSE Crypto crypto/*)
 file(GLOB_RECURSE CryptoNoteCore cryptonote/core/* CryptoNoteConfig.h)

diff --git a/src/ComplexWallet/ComplexWallet.cpp b/src/ComplexWallet/ComplexWallet.cpp
@@ -33,7 +33,7 @@
 #include "Wallet/WalletRpcServer.h"
 #include "Wallet/LegacyKeysImporter.h"
 #include "WalletLegacy/WalletHelper.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdOutputStream.h"
 
 #include "version.h"
 

diff --git a/src/ComplexWallet/WalletFile.cpp b/src/ComplexWallet/WalletFile.cpp
@@ -6,7 +6,7 @@
 #include "CryptoNoteConfig.h"
 #include "WalletLegacy/KeysStorage.h"
 #include "common/StringTools.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdOutputStream.h"
 #include "common/Base58.h"
 #include "cryptonote/core/CryptoNoteBasicImpl.h"
 #include "cryptonote/core/Currency.h"

diff --git a/src/ComplexWallet/WalletManager.cpp b/src/ComplexWallet/WalletManager.cpp
@@ -19,8 +19,8 @@
 
 #include "common/ScopeExit.h"
 #include "common/ShuffleGenerator.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "common/StringTools.h"
 #include "cryptonote/core/Account.h"
 #include "cryptonote/core/Currency.h"

diff --git a/src/MultiWalletService/WalletInterface.cpp b/src/MultiWalletService/WalletInterface.cpp
@@ -22,8 +22,8 @@
 
 #include "common/ScopeExit.h"
 #include "common/ShuffleGenerator.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "common/StringTools.h"
 #include "cryptonote/core/Account.h"
 #include "cryptonote/core/Currency.h"

diff --git a/src/P2p/LevinProtocol.h b/src/P2p/LevinProtocol.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "cryptonote.h"
-#include <common/MemoryInputStream.h>
-#include <common/VectorOutputStream.h>
+#include <stream/MemoryInputStream.h>
+#include <stream/VectorOutputStream.h>
 #include "Serialization/KVBinaryInputStreamSerializer.h"
 #include "Serialization/KVBinaryOutputStreamSerializer.h"
 

diff --git a/src/P2p/NetNode.cpp b/src/P2p/NetNode.cpp
@@ -25,8 +25,8 @@
 #include <System/TcpConnector.h>
 
 #include "version.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "common/Util.h"
 #include "crypto/crypto.h"
 

diff --git a/src/P2p/P2pNode.cpp b/src/P2p/P2pNode.cpp
@@ -13,8 +13,8 @@
 #include <System/TcpConnection.h>
 #include <System/TcpConnector.h>
 
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 

diff --git a/src/Serialization/BinaryInputStreamSerializer.cpp b/src/Serialization/BinaryInputStreamSerializer.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <cassert>
 #include <stdexcept>
-#include <common/StreamTools.h>
+#include <stream/StreamTools.h>
 #include "SerializationOverloads.h"
 
 using namespace Common;

diff --git a/src/Serialization/BinaryInputStreamSerializer.h b/src/Serialization/BinaryInputStreamSerializer.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <common/IInputStream.h>
+#include <stream/IInputStream.h>
 #include "ISerializer.h"
 #include "SerializationOverloads.h"
 

diff --git a/src/Serialization/BinaryOutputStreamSerializer.cpp b/src/Serialization/BinaryOutputStreamSerializer.cpp
@@ -6,7 +6,7 @@
 
 #include <cassert>
 #include <stdexcept>
-#include "common/StreamTools.h"
+#include "stream/StreamTools.h"
 
 using namespace Common;
 

diff --git a/src/Serialization/BinaryOutputStreamSerializer.h b/src/Serialization/BinaryOutputStreamSerializer.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "common/IOutputStream.h"
+#include "stream/IOutputStream.h"
 #include "ISerializer.h"
 #include "SerializationOverloads.h"
 

diff --git a/src/Serialization/BinarySerializationTools.h b/src/Serialization/BinarySerializationTools.h
@@ -5,10 +5,10 @@
 #include <cryptonote.h>
 #include "BinaryInputStreamSerializer.h"
 #include "BinaryOutputStreamSerializer.h"
-#include "common/MemoryInputStream.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
-#include "common/VectorOutputStream.h"
+#include "stream/MemoryInputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
+#include "stream/VectorOutputStream.h"
 
 #include <fstream>
 

diff --git a/src/Serialization/KVBinaryInputStreamSerializer.cpp b/src/Serialization/KVBinaryInputStreamSerializer.cpp
@@ -8,7 +8,7 @@
 #include <cassert>
 #include <cstring>
 #include <stdexcept>
-#include <common/StreamTools.h>
+#include <stream/StreamTools.h>
 #include "KVBinaryCommon.h"
 
 using namespace Common;

diff --git a/src/Serialization/KVBinaryInputStreamSerializer.h b/src/Serialization/KVBinaryInputStreamSerializer.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <common/IInputStream.h>
+#include <stream/IInputStream.h>
 #include "ISerializer.h"
 #include "JsonInputValueSerializer.h"
 

diff --git a/src/Serialization/KVBinaryOutputStreamSerializer.cpp b/src/Serialization/KVBinaryOutputStreamSerializer.cpp
@@ -7,7 +7,7 @@
 
 #include <cassert>
 #include <stdexcept>
-#include <common/StreamTools.h>
+#include <stream/StreamTools.h>
 
 using namespace Common;
 using namespace cryptonote;

diff --git a/src/Serialization/KVBinaryOutputStreamSerializer.h b/src/Serialization/KVBinaryOutputStreamSerializer.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <vector>
-#include <common/IOutputStream.h>
+#include <stream/IOutputStream.h>
 #include "ISerializer.h"
 #include "MemoryStream.h"
 

diff --git a/src/Serialization/MemoryStream.h b/src/Serialization/MemoryStream.h
@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <cstring> // memcpy
 #include <vector>
-#include <common/IOutputStream.h>
+#include <stream/IOutputStream.h>
 
 namespace cryptonote {
 

diff --git a/src/Serialization/SerializationTools.h b/src/Serialization/SerializationTools.h
@@ -6,8 +6,8 @@
 
 #include <list>
 #include <vector>
-#include <common/MemoryInputStream.h>
-#include <common/StringOutputStream.h>
+#include <stream/MemoryInputStream.h>
+#include <stream/StringOutputStream.h>
 #include "JsonInputStreamSerializer.h"
 #include "JsonOutputStreamSerializer.h"
 #include "KVBinaryInputStreamSerializer.h"

diff --git a/src/Transfers/SynchronizationState.cpp b/src/Transfers/SynchronizationState.cpp
@@ -4,8 +4,8 @@
 
 #include "SynchronizationState.h"
 
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 #include "cryptonote/core/CryptoNoteSerialization.h"

diff --git a/src/Transfers/TransfersContainer.cpp b/src/Transfers/TransfersContainer.cpp
@@ -4,8 +4,8 @@
 
 #include "TransfersContainer.h"
 #include "IWalletLegacy.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "cryptonote/core/CryptoNoteFormatUtils.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"

diff --git a/src/Transfers/TransfersSynchronizer.cpp b/src/Transfers/TransfersSynchronizer.cpp
@@ -5,8 +5,8 @@
 #include "TransfersSynchronizer.h"
 #include "TransfersConsumer.h"
 
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 

diff --git a/src/Wallet/WalletGreen.cpp b/src/Wallet/WalletGreen.cpp
@@ -20,8 +20,8 @@
 
 #include "common/ScopeExit.h"
 #include "common/ShuffleGenerator.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "common/StringTools.h"
 #include "cryptonote/core/Account.h"
 #include "cryptonote/core/Currency.h"

diff --git a/src/Wallet/WalletSerialization.cpp b/src/Wallet/WalletSerialization.cpp
@@ -8,9 +8,9 @@
 #include <sstream>
 #include <type_traits>
 
-#include "common/MemoryInputStream.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/MemoryInputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "cryptonote/core/CryptoNoteSerialization.h"
 #include "cryptonote/core/CryptoNoteTools.h"
 

diff --git a/src/Wallet/WalletSerialization.h b/src/Wallet/WalletSerialization.h
@@ -6,8 +6,8 @@
 
 #include "IWallet.h"
 #include "WalletIndices.h"
-#include "common/IInputStream.h"
-#include "common/IOutputStream.h"
+#include "stream/IInputStream.h"
+#include "stream/IOutputStream.h"
 #include "Transfers/TransfersSynchronizer.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 

diff --git a/src/WalletLegacy/WalletLegacySerializer.cpp b/src/WalletLegacy/WalletLegacySerializer.cpp
@@ -6,9 +6,9 @@
 
 #include <stdexcept>
 
-#include "common/MemoryInputStream.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/MemoryInputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "cryptonote/core/Account.h"

diff --git a/src/api/account.cpp b/src/api/account.cpp
@@ -6,7 +6,7 @@
 #include "CryptoNoteConfig.h"
 // #include "WalletLegacy/KeysStorage.h"
 // #include "common/StringTools.h"
-// #include "common/StdOutputStream.h"
+// #include "stream/StdOutputStream.h"
 #include "common/Base58.h"
 #include "cryptonote/core/CryptoNoteBasicImpl.h"
 #include "cryptonote/core/Currency.h"

diff --git a/src/cryptonote/core/Blockchain.cpp b/src/cryptonote/core/Blockchain.cpp
@@ -9,8 +9,8 @@
 #include <boost/foreach.hpp>
 #include "common/Math.h"
 #include "common/ShuffleGenerator.h"
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Rpc/CoreRpcServerCommandsDefinitions.h"
 #include "Serialization/BinarySerializationTools.h"
 #include "CryptoNoteTools.h"

diff --git a/src/cryptonote/core/CryptoNoteSerialization.cpp b/src/cryptonote/core/CryptoNoteSerialization.cpp
@@ -16,7 +16,7 @@
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 
-#include "common/StringOutputStream.h"
+#include "stream/StringOutputStream.h"
 #include "crypto/crypto.h"
 
 #include "Account.h"

diff --git a/src/cryptonote/core/CryptoNoteTools.h b/src/cryptonote/core/CryptoNoteTools.h
@@ -5,9 +5,9 @@
 #pragma once
 
 #include <limits>
-#include "common/MemoryInputStream.h"
+#include "stream/MemoryInputStream.h"
 #include "common/StringTools.h"
-#include "common/VectorOutputStream.h"
+#include "stream/VectorOutputStream.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "CryptoNoteSerialization.h"

diff --git a/src/cryptonote/core/SwappedVector.h b/src/cryptonote/core/SwappedVector.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 

diff --git a/src/cryptonote/core/TransactionExtra.cpp b/src/cryptonote/core/TransactionExtra.cpp
@@ -4,8 +4,8 @@
 
 #include "TransactionExtra.h"
 
-#include "common/MemoryInputStream.h"
-#include "common/StreamTools.h"
+#include "stream/MemoryInputStream.h"
+#include "stream/StreamTools.h"
 #include "common/StringTools.h"
 #include "CryptoNoteTools.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"

diff --git a/src/cryptonote/core/blockchain/serializer/block_cache.hpp b/src/cryptonote/core/blockchain/serializer/block_cache.hpp
@@ -3,9 +3,9 @@
 #include "crypto/hash.h"
 #include <Logging/LoggerRef.h>
 #include <Logging/ILogger.h>
-#include <common/StdInputStream.h>
+#include <stream/StdInputStream.h>
 #include <Serialization/BinaryInputStreamSerializer.h>
-#include <common/StdOutputStream.h>
+#include <stream/StdOutputStream.h>
 #include <Serialization/BinaryOutputStreamSerializer.h>
 #include <fstream>
 #include <chrono>

diff --git a/src/cryptonote/core/blockchain/serializer/blockchain_indices.hpp b/src/cryptonote/core/blockchain/serializer/blockchain_indices.hpp
@@ -3,9 +3,9 @@
 #include "crypto/hash.h"
 #include <Logging/LoggerRef.h>
 #include <Logging/ILogger.h>
-#include <common/StdInputStream.h>
+#include <stream/StdInputStream.h>
 #include <Serialization/BinaryInputStreamSerializer.h>
-#include <common/StdOutputStream.h>
+#include <stream/StdOutputStream.h>
 #include <Serialization/BinaryOutputStreamSerializer.h>
 #include <fstream>
 #include <chrono>

diff --git a/src/common/IInputStream.cpp → src/stream/IInputStream.cpp b/src/common/IInputStream.cpp → src/stream/IInputStream.cpp
diff --git a/src/common/IInputStream.h → src/stream/IInputStream.h b/src/common/IInputStream.h → src/stream/IInputStream.h
diff --git a/src/common/IOutputStream.cpp → src/stream/IOutputStream.cpp b/src/common/IOutputStream.cpp → src/stream/IOutputStream.cpp
diff --git a/src/common/IOutputStream.h → src/stream/IOutputStream.h b/src/common/IOutputStream.h → src/stream/IOutputStream.h
diff --git a/src/common/MemoryInputStream.cpp → src/stream/MemoryInputStream.cpp b/src/common/MemoryInputStream.cpp → src/stream/MemoryInputStream.cpp
diff --git a/src/common/MemoryInputStream.h → src/stream/MemoryInputStream.h b/src/common/MemoryInputStream.h → src/stream/MemoryInputStream.h
diff --git a/src/common/StdInputStream.cpp → src/stream/StdInputStream.cpp b/src/common/StdInputStream.cpp → src/stream/StdInputStream.cpp
diff --git a/src/common/StdInputStream.h → src/stream/StdInputStream.h b/src/common/StdInputStream.h → src/stream/StdInputStream.h
diff --git a/src/common/StdOutputStream.cpp → src/stream/StdOutputStream.cpp b/src/common/StdOutputStream.cpp → src/stream/StdOutputStream.cpp
diff --git a/src/common/StdOutputStream.h → src/stream/StdOutputStream.h b/src/common/StdOutputStream.h → src/stream/StdOutputStream.h
diff --git a/src/common/StreamTools.cpp → src/stream/StreamTools.cpp b/src/common/StreamTools.cpp → src/stream/StreamTools.cpp
diff --git a/src/common/StreamTools.h → src/stream/StreamTools.h b/src/common/StreamTools.h → src/stream/StreamTools.h
diff --git a/src/common/StringInputStream.cpp → src/stream/StringInputStream.cpp b/src/common/StringInputStream.cpp → src/stream/StringInputStream.cpp
diff --git a/src/common/StringInputStream.h → src/stream/StringInputStream.h b/src/common/StringInputStream.h → src/stream/StringInputStream.h
diff --git a/src/common/StringOutputStream.cpp → src/stream/StringOutputStream.cpp b/src/common/StringOutputStream.cpp → src/stream/StringOutputStream.cpp
diff --git a/src/common/StringOutputStream.h → src/stream/StringOutputStream.h b/src/common/StringOutputStream.h → src/stream/StringOutputStream.h
diff --git a/src/common/VectorOutputStream.cpp → src/stream/VectorOutputStream.cpp b/src/common/VectorOutputStream.cpp → src/stream/VectorOutputStream.cpp
diff --git a/src/common/VectorOutputStream.h → src/stream/VectorOutputStream.h b/src/common/VectorOutputStream.h → src/stream/VectorOutputStream.h
diff --git a/tests/UnitTests/Serialization.cpp b/tests/UnitTests/Serialization.cpp
@@ -4,8 +4,8 @@
 
 #include "gtest/gtest.h"
 
-#include "common/StdInputStream.h"
-#include "common/StdOutputStream.h"
+#include "stream/StdInputStream.h"
+#include "stream/StdOutputStream.h"
 #include "Serialization/BinaryInputStreamSerializer.h"
 #include "Serialization/BinaryOutputStreamSerializer.h"
 #include "Serialization/BinarySerializationTools.h"