forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -1,12 +1,25 @@
|
||||
#ifndef C_TOXCORE_TOXCORE_DHT_TEST_UTIL_H
|
||||
#define C_TOXCORE_TOXCORE_DHT_TEST_UTIL_H
|
||||
|
||||
#include <array>
|
||||
#include <functional>
|
||||
#include <iosfwd>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "crypto_core.h"
|
||||
#include "logger.h"
|
||||
#include "mono_time.h"
|
||||
#include "net_crypto.h"
|
||||
#include "test_util.hh"
|
||||
|
||||
namespace tox::test {
|
||||
class SimulatedEnvironment;
|
||||
struct ScopedToxSystem;
|
||||
}
|
||||
|
||||
template <>
|
||||
struct Deleter<DHT> : Function_Deleter<DHT, kill_dht> { };
|
||||
|
||||
@@ -16,4 +29,88 @@ std::ostream &operator<<(std::ostream &out, Node_format const &v);
|
||||
|
||||
Node_format random_node_format(const Random *rng);
|
||||
|
||||
// --- Mock DHT ---
|
||||
struct MockDHT {
|
||||
uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
|
||||
uint8_t self_secret_key[CRYPTO_SECRET_KEY_SIZE];
|
||||
// Cache for shared keys: Public Key -> Shared Key
|
||||
std::map<std::array<uint8_t, CRYPTO_PUBLIC_KEY_SIZE>,
|
||||
std::array<uint8_t, CRYPTO_SHARED_KEY_SIZE>>
|
||||
shared_keys;
|
||||
int computation_count = 0;
|
||||
|
||||
explicit MockDHT(const Random *rng);
|
||||
|
||||
const uint8_t *get_shared_key(const uint8_t *pk);
|
||||
|
||||
static const Net_Crypto_DHT_Funcs funcs;
|
||||
};
|
||||
|
||||
// --- Mock DHT Wrapper ---
|
||||
// Wraps a MockDHT instance and its dependencies (networking, etc.) within a SimulatedEnvironment
|
||||
class WrappedMockDHT {
|
||||
public:
|
||||
WrappedMockDHT(tox::test::SimulatedEnvironment &env, uint16_t port);
|
||||
|
||||
MockDHT *get_dht() { return &dht_; }
|
||||
const uint8_t *dht_public_key() const { return dht_.self_public_key; }
|
||||
const uint8_t *dht_secret_key() const { return dht_.self_secret_key; }
|
||||
int dht_computation_count() const { return dht_.computation_count; }
|
||||
|
||||
// Returns a valid IP_Port for this node in the simulation (Localhost IPv6)
|
||||
IP_Port get_ip_port() const;
|
||||
|
||||
void poll();
|
||||
|
||||
tox::test::ScopedToxSystem &node() { return *node_; }
|
||||
const tox::test::ScopedToxSystem &node() const { return *node_; }
|
||||
Networking_Core *networking() { return networking_.get(); }
|
||||
Mono_Time *mono_time() { return mono_time_.get(); }
|
||||
Logger *logger() { return logger_.get(); }
|
||||
|
||||
~WrappedMockDHT();
|
||||
|
||||
static const Net_Crypto_DHT_Funcs funcs;
|
||||
|
||||
private:
|
||||
std::unique_ptr<tox::test::ScopedToxSystem> node_;
|
||||
std::unique_ptr<Logger, void (*)(Logger *)> logger_;
|
||||
std::unique_ptr<Mono_Time, std::function<void(Mono_Time *)>> mono_time_;
|
||||
std::unique_ptr<Networking_Core, void (*)(Networking_Core *)> networking_;
|
||||
MockDHT dht_;
|
||||
};
|
||||
|
||||
// --- Real DHT Wrapper ---
|
||||
// Wraps a DHT instance and its dependencies within a SimulatedEnvironment
|
||||
class WrappedDHT {
|
||||
public:
|
||||
WrappedDHT(tox::test::SimulatedEnvironment &env, uint16_t port);
|
||||
|
||||
DHT *get_dht() { return dht_.get(); }
|
||||
const uint8_t *dht_public_key() const;
|
||||
const uint8_t *dht_secret_key() const;
|
||||
|
||||
// Returns a valid IP_Port for this node in the simulation (Localhost IPv6)
|
||||
IP_Port get_ip_port() const;
|
||||
|
||||
void poll();
|
||||
|
||||
tox::test::ScopedToxSystem &node() { return *node_; }
|
||||
const tox::test::ScopedToxSystem &node() const { return *node_; }
|
||||
Networking_Core *networking() { return networking_.get(); }
|
||||
Mono_Time *mono_time() { return mono_time_.get(); }
|
||||
Logger *logger() { return logger_.get(); }
|
||||
|
||||
~WrappedDHT();
|
||||
|
||||
static const Net_Crypto_DHT_Funcs funcs;
|
||||
|
||||
private:
|
||||
std::unique_ptr<tox::test::ScopedToxSystem> node_;
|
||||
std::unique_ptr<Logger, void (*)(Logger *)> logger_;
|
||||
std::unique_ptr<Mono_Time, std::function<void(Mono_Time *)>> mono_time_;
|
||||
std::unique_ptr<Networking_Core, void (*)(Networking_Core *)> networking_;
|
||||
std::unique_ptr<DHT, void (*)(DHT *)> dht_;
|
||||
};
|
||||
|
||||
#endif // C_TOXCORE_TOXCORE_DHT_TEST_UTIL_H
|
||||
|
||||
Reference in New Issue
Block a user