Skip to content

Commit 2507118

Browse files
authored
Merge pull request #952 from evoskuil/master
Move BC_HTTP_SERVER_NAME to network, comments, del stray file.
2 parents 1a96816 + b595fbc commit 2507118

10 files changed

Lines changed: 7 additions & 3408 deletions

File tree

benchmark.txt

Lines changed: 0 additions & 3397 deletions
This file was deleted.

include/bitcoin/node/channels/channel_electrum.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ namespace libbitcoin {
3030
namespace node {
3131

3232
// TODO: strip extraneous args before electrum version dispatch.
33-
// TODO: move version_ and name_ members into channel with set/get.
34-
// TODO: move to electrum version method to handshake protocol.
3533
/// Channel for electrum channels (non-http json-rpc).
3634
class BCN_API channel_electrum
3735
: public node::channel,

include/bitcoin/node/parsers/bitcoind_query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace node {
2727
BCN_API bool bitcoind_query(network::rpc::request_t& out,
2828
const network::http::request& request) NOEXCEPT;
2929

30-
} // namespace network
30+
} // namespace node
3131
} // namespace libbitcoin
3232

3333
#endif

include/bitcoin/node/parsers/bitcoind_target.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace node {
2727
BCN_API code bitcoind_target(network::rpc::request_t& out,
2828
const std::string_view& path) NOEXCEPT;
2929

30-
} // namespace network
30+
} // namespace node
3131
} // namespace libbitcoin
3232

3333
#endif

include/bitcoin/node/parsers/electrum_version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ enum class electrum_version
6666
v1_6
6767
};
6868

69-
} // namespace network
69+
} // namespace node
7070
} // namespace libbitcoin
7171

7272
#endif

include/bitcoin/node/parsers/explore_query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace node {
2727
BCN_API bool explore_query(network::rpc::request_t& out,
2828
const network::http::request& request) NOEXCEPT;
2929

30-
} // namespace network
30+
} // namespace node
3131
} // namespace libbitcoin
3232

3333
#endif

include/bitcoin/node/parsers/explore_target.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace node {
2727
BCN_API code explore_target(network::rpc::request_t& out,
2828
const std::string_view& path) NOEXCEPT;
2929

30-
} // namespace network
30+
} // namespace node
3131
} // namespace libbitcoin
3232

3333
#endif

include/bitcoin/node/sessions/sessions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using session_stratum_v2 = session_server<protocol_stratum_v2>;
4141
using session_electrum = session_handshake<protocol_electrum_version,
4242
protocol_electrum>;
4343

44-
} // namespace network
44+
} // namespace node
4545
} // namespace libbitcoin
4646

4747
#endif

include/bitcoin/node/settings.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class BCN_API settings
102102

103103
namespace server {
104104

105-
/// HACK: must cast writer to non-const.
105+
// HACK: must cast writer to non-const.
106106
using span_value = network::http::span_body::value_type;
107107

108108
/// [server] settings.

src/parser.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include <bitcoin/node/configuration.hpp>
2323
#include <bitcoin/node/settings.hpp>
2424

25-
#define BC_HTTP_SERVER_NAME "libbitcoin/4.0"
26-
2725
////std::filesystem::path config_default_path() NOEXCEPT
2826
////{
2927
//// return { "libbitcoin/bn.cfg" };

0 commit comments

Comments
 (0)