Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
259 changes: 255 additions & 4 deletions qa/rpc-tests/llmq-is-cl-conflicts.py

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions qa/rpc-tests/test_framework/mininode.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,23 +391,23 @@ def serialize(self):

def __repr__(self):
return "CInv(type=%s hash=%064x)" \
% (self.typemap[self.type], self.hash)
% (self.typemap.get(self.type, self.type), self.hash)


class msg_notfound():
command = b"notfound"

def __init__(self):
pass
def __init__(self, inv=None):
self.inv = inv if inv is not None else []

def deserialize(self, f):
pass
self.inv = deser_vector(f, CInv)

def serialize(self):
return b""
return ser_vector(self.inv)

def __repr__(self):
return "msg_notfound()"
return "msg_notfound(inv=%s)" % repr(self.inv)


class CBlockLocator(object):
Expand Down Expand Up @@ -2016,7 +2016,7 @@ def on_reject(self, conn, message): pass
def on_open(self, conn): pass
def on_close(self, conn): pass
def on_mempool(self, conn): pass
def on_notfound(self, message): pass
def on_notfound(self, conn, message): pass
def on_pong(self, conn, message): pass
def on_feefilter(self, conn, message): pass
def on_sendheaders(self, conn, message): pass
Expand Down
5 changes: 5 additions & 0 deletions qa/rpc-tests/test_framework/test_framework.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ def prepare_masternode(self, idx):

# send to same address to reserve some funds for fees
self.nodes[0].sendtoaddress(address, 0.001)
# Without quorums, funding and registration transactions must age past the ten-minute safe-mining delay.
set_mocktime(get_mocktime() + 601)
set_node_times(self.nodes, get_mocktime())

ownerAddr = self.nodes[0].getnewaddress()
votingAddr = self.nodes[0].getnewaddress()
Expand All @@ -482,6 +485,8 @@ def prepare_masternode(self, idx):
else:
self.nodes[0].generate(1)
proTxHash = self.nodes[0].protx('register', txid, collateral_vout, '127.0.0.1:%d' % port, ownerAddr, bls['public'], votingAddr, 0, rewardsAddr, address)
set_mocktime(get_mocktime() + 601)
set_node_times(self.nodes, get_mocktime())
self.nodes[0].generate(1)

self.mninfo.append(ZnodeInfo(proTxHash, ownerAddr, votingAddr, bls['public'], bls['secret'], address, txid, collateral_vout))
Expand Down
1 change: 1 addition & 0 deletions src/llmq/quorums_chainlocks.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class CChainLockSig
class CChainLocksHandler : public CRecoveredSigsListener
{
friend struct CChainLocksHandlerTestAccess;
friend struct CInstantSendManagerTestAccess;

static const int64_t CLEANUP_INTERVAL = 1000 * 30;
static const int64_t CLEANUP_SEEN_TIMEOUT = 24 * 60 * 60 * 1000;
Expand Down
Loading
Loading