mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015)
This commit is contained in:
commit
006073614d
122 changed files with 1077 additions and 574 deletions
|
|
@ -42,6 +42,9 @@
|
|||
#include <event2/keyvalq_struct.h>
|
||||
#include <support/events.h>
|
||||
|
||||
using util::Join;
|
||||
using util::ToString;
|
||||
|
||||
// The server returns time values from a mockable system clock, but it is not
|
||||
// trivial to get the mocked time from the server, nor is it needed for now, so
|
||||
// just use a plain system_clock.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue