From abda10d8849080eca32a03be968211476bd05dd7 Mon Sep 17 00:00:00 2001
From: serkixenos <serki.xenos@gmail.com>
Date: Tue, 26 Jul 2022 19:43:32 +0200
Subject: [PATCH] Remove WS client

---
 .../plugins/peerplays_sidechain/common/rpc_client.cpp     | 1 +
 .../sidechain_net_handler_ethereum.hpp                    | 6 ------
 .../peerplays_sidechain/sidechain_net_handler_bitcoin.cpp | 8 ++++----
 .../sidechain_net_handler_ethereum.cpp                    | 3 ---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp b/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
index 357c435c..ffa5f9a9 100644
--- a/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
+++ b/libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
@@ -13,6 +13,7 @@
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/beast/http.hpp>
 
+#include <fc/crypto/base64.hpp>
 #include <fc/log/logger.hpp>
 
 namespace graphene { namespace peerplays_sidechain {
diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
index 9b374588..681ceaed 100644
--- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
+++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_ethereum.hpp
@@ -7,7 +7,6 @@
 #include <boost/signals2.hpp>
 
 #include <graphene/peerplays_sidechain/common/rpc_client.hpp>
-#include <graphene/peerplays_sidechain/common/ws_client.hpp>
 #include <graphene/peerplays_sidechain/ethereum/types.hpp>
 
 namespace graphene { namespace peerplays_sidechain {
@@ -25,11 +24,6 @@ public:
    std::string get_network_id();
 };
 
-class ethereum_ws_client : public ws_client {
-public:
-   ethereum_ws_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls);
-};
-
 class sidechain_net_handler_ethereum : public sidechain_net_handler {
 public:
    sidechain_net_handler_ethereum(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options);
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
index 8c820363..0d3da223 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
@@ -356,13 +356,13 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
    }
 
    std::string url = ip + ":" + std::to_string(rpc_port);
-   if (wallet.length() > 0) {
-      url = url + "/wallet/" + wallet;
+   if (!wallet_name.empty()) {
+      url = url + "/wallet/" + wallet_name;
    }
 
    bitcoin_client = std::unique_ptr<bitcoin_rpc_client>(new bitcoin_rpc_client(url, rpc_user, rpc_password, debug_rpc_calls));
-   if (!wallet.empty()) {
-      bitcoin_client->loadwallet(wallet);
+   if (!wallet_name.empty()) {
+      bitcoin_client->loadwallet(wallet_name);
    }
 
    std::string blockchain_info = bitcoin_client->getblockchaininfo();
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
index 2bbb5082..58d22b00 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
@@ -55,9 +55,6 @@ std::string ethereum_rpc_client::get_network_id() {
    return retrieve_value_from_reply(reply_str, "protocols.eth.network");
 }
 
-ethereum_ws_client::ethereum_ws_client(const std::string &url, const std::string &user_name, const std::string &password, bool debug_rpc_calls) :
-      ws_client(url, user_name, password, debug_rpc_calls){};
-
 sidechain_net_handler_ethereum::sidechain_net_handler_ethereum(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
       sidechain_net_handler(_plugin, options) {
    sidechain = sidechain_type::ethereum;