mirror of
https://github.com/SChernykh/p2pool.git
synced 2024-12-22 19:39:22 +00:00
Merge branch 'master' into merge-mining
This commit is contained in:
commit
45dabd8ddb
5 changed files with 9 additions and 9 deletions
|
@ -28,12 +28,12 @@ class ConsoleCommands : public TCPServer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ConsoleCommands(p2pool* pool);
|
explicit ConsoleCommands(p2pool* pool);
|
||||||
~ConsoleCommands();
|
~ConsoleCommands() override;
|
||||||
|
|
||||||
struct ConsoleClient : public Client
|
struct ConsoleClient : public Client
|
||||||
{
|
{
|
||||||
ConsoleClient() : Client(m_consoleReadBuf, sizeof(m_consoleReadBuf)) {}
|
ConsoleClient() : Client(m_consoleReadBuf, sizeof(m_consoleReadBuf)) {}
|
||||||
~ConsoleClient() {}
|
~ConsoleClient() override {}
|
||||||
|
|
||||||
static Client* allocate() { return new ConsoleClient(); }
|
static Client* allocate() { return new ConsoleClient(); }
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
explicit P2PServer(p2pool *pool);
|
explicit P2PServer(p2pool *pool);
|
||||||
~P2PServer();
|
~P2PServer() override;
|
||||||
|
|
||||||
void add_cached_block(const PoolBlock& block);
|
void add_cached_block(const PoolBlock& block);
|
||||||
void clear_cached_blocks();
|
void clear_cached_blocks();
|
||||||
|
@ -72,7 +72,7 @@ public:
|
||||||
struct P2PClient : public Client
|
struct P2PClient : public Client
|
||||||
{
|
{
|
||||||
P2PClient();
|
P2PClient();
|
||||||
~P2PClient();
|
~P2PClient() override;
|
||||||
|
|
||||||
static Client* allocate() { return new P2PClient(); }
|
static Client* allocate() { return new P2PClient(); }
|
||||||
virtual size_t size() const override { return sizeof(P2PClient); }
|
virtual size_t size() const override { return sizeof(P2PClient); }
|
||||||
|
|
|
@ -40,7 +40,7 @@ class p2pool : public MinerCallbackHandler, public nocopy_nomove
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
p2pool(int argc, char* argv[]);
|
p2pool(int argc, char* argv[]);
|
||||||
~p2pool();
|
~p2pool() override;
|
||||||
|
|
||||||
int run();
|
int run();
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ class RandomX_Hasher : public RandomX_Hasher_Base
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit RandomX_Hasher(p2pool* pool);
|
explicit RandomX_Hasher(p2pool* pool);
|
||||||
~RandomX_Hasher();
|
~RandomX_Hasher() override;
|
||||||
|
|
||||||
void set_seed_async(const hash& seed) override;
|
void set_seed_async(const hash& seed) override;
|
||||||
void set_seed(const hash& seed);
|
void set_seed(const hash& seed);
|
||||||
|
@ -98,7 +98,7 @@ class RandomX_Hasher_RPC : public RandomX_Hasher_Base
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit RandomX_Hasher_RPC(p2pool* pool);
|
explicit RandomX_Hasher_RPC(p2pool* pool);
|
||||||
~RandomX_Hasher_RPC();
|
~RandomX_Hasher_RPC() override;
|
||||||
|
|
||||||
bool calculate(const void* data_ptr, size_t size, uint64_t height, const hash& seed, hash& h, bool force_light_mode) override;
|
bool calculate(const void* data_ptr, size_t size, uint64_t height, const hash& seed, hash& h, bool force_light_mode) override;
|
||||||
|
|
||||||
|
|
|
@ -32,14 +32,14 @@ class StratumServer : public TCPServer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit StratumServer(p2pool *pool);
|
explicit StratumServer(p2pool *pool);
|
||||||
~StratumServer();
|
~StratumServer() override;
|
||||||
|
|
||||||
void on_block(const BlockTemplate& block);
|
void on_block(const BlockTemplate& block);
|
||||||
|
|
||||||
struct StratumClient : public Client
|
struct StratumClient : public Client
|
||||||
{
|
{
|
||||||
StratumClient();
|
StratumClient();
|
||||||
FORCEINLINE ~StratumClient() {}
|
FORCEINLINE ~StratumClient() override {}
|
||||||
|
|
||||||
static Client* allocate() { return new StratumClient(); }
|
static Client* allocate() { return new StratumClient(); }
|
||||||
virtual size_t size() const override { return sizeof(StratumClient); }
|
virtual size_t size() const override { return sizeof(StratumClient); }
|
||||||
|
|
Loading…
Reference in a new issue