ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-06-09 11:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance test.py and metrics.py

Browse Source
This commit is contained in:
CJ Cobb
2021-03-22 11:12:07 -04:00
parent 4fc44c5ac8
commit 2ef28ff9be
4 changed files with 126 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
test.py
View File

@@ -91,7 +91,9 @@ def compareAccountTx(aldous, p2p):
else:
print("Mismatch responses")
print(len(aldousTxns))
print(len(aldous["transactions"]))
print(len(p2pTxns))
print(len(p2p["transactions"]))
print(maxLedger)
def compareLedgerData(aldous, p2p):
@@ -152,19 +154,24 @@ def getMinAndMax(res):
maxSeq = seq
return (minSeq,maxSeq)
async def account_tx(ip, port, account, binary):
async def account_tx(ip, port, account, binary, minLedger=None, maxLedger=None):
address = 'ws://' + str(ip) + ':' + str(port)
try:
async with websockets.connect(address) as ws:
await ws.send(json.dumps({"command":"account_tx","account":account, "binary":bool(binary),"limit":200}))
if minLedger is None or maxLedger is None:
await ws.send(json.dumps({"command":"account_tx","account":account, "binary":bool(binary),"limit":200}))
else:
await ws.send(json.dumps({"command":"account_tx","account":account, "binary":bool(binary),"limit":200,"ledger_index_min":minLedger, "ledger_index_max":maxLedger}))
res = json.loads(await ws.recv())
print(json.dumps(res,indent=4,sort_keys=True))
return res
except websockets.exceptions.ConnectionClosedError as e:
print(e)
async def account_tx_full(ip, port, account, binary):
async def account_tx_full(ip, port, account, binary,minLedger=None, maxLedger=None):
address = 'ws://' + str(ip) + ':' + str(port)
try:
cursor = None
@@ -179,6 +186,9 @@ async def account_tx_full(ip, port, account, binary):
req["cursor"] = cursor
if not marker is None:
req["marker"] = marker
if minLedger is not None and maxLedger is not None:
req["ledger_index_min"] = minLedger
req["ledger_index_max"] = maxLedger
await ws.send(json.dumps(req))
res = json.loads(await ws.recv())
#print(json.dumps(res,indent=4,sort_keys=True))
@@ -433,9 +443,11 @@ async def ledger_range(ip, port):
if "error" in res:
await ws.send(json.dumps({"command":"server_info"}))
res = json.loads(await ws.recv())
print(json.dumps(res,indent=4,sort_keys=True))
return res["result"]["info"]["validated_ledger"]["seq"]
return res["ledger_index_max"]
rng = res["result"]["info"]["complete_ledgers"]
idx = rng.find("-")
return (int(rng[0:idx]),int(rng[idx+1:-1]))
return (res["ledger_index_min"],res["ledger_index_max"])
except websockets.exceptions.connectionclosederror as e:
print(e)
@@ -459,7 +471,7 @@ parser.add_argument('--expand',default=False)
parser.add_argument('--transactions',default=False)
parser.add_argument('--minLedger',default=-1)
parser.add_argument('--maxLedger',default=-1)
parser.add_argument('--filename')
parser.add_argument('--filename',default=None)
parser.add_argument('--index')
@@ -470,7 +482,7 @@ args = parser.parse_args()
def run(args):
asyncio.set_event_loop(asyncio.new_event_loop())
if(args.ledger is None):
args.ledger = asyncio.get_event_loop().run_until_complete(ledger_range(args.ip, args.port));
args.ledger = asyncio.get_event_loop().run_until_complete(ledger_range(args.ip, args.port))[1]
if args.action == "account_info":
res1 = asyncio.get_event_loop().run_until_complete(
account_info(args.ip, args.port, args.account, args.ledger, args.binary))
@@ -487,19 +499,27 @@ def run(args):
asyncio.get_event_loop().run_until_complete(
tx(args.ip, args.port, args.hash, args.binary))
elif args.action == "account_tx":
if args.verify:
args.binary=True
rng = asyncio.get_event_loop().run_until_complete(ledger_range(args.ip, args.port))
res = asyncio.get_event_loop().run_until_complete(
account_tx(args.ip, args.port, args.account, args.binary))
if args.verify:
res2 = asyncio.get_event_loop().run_until_complete(
account_tx(args.p2pIp, args.p2pPort, args.account, args.binary))
account_tx(args.p2pIp, args.p2pPort, args.account, args.binary,rng[0],rng[1]))
print(compareAccountTx(res,res2))
elif args.action == "account_tx_full":
if args.verify:
args.binary=True
rng = asyncio.get_event_loop().run_until_complete(ledger_range(args.ip, args.port))
res = asyncio.get_event_loop().run_until_complete(
account_tx_full(args.ip, args.port, args.account, args.binary))
print(len(res["transactions"]))
if args.verify:
res2 = asyncio.get_event_loop().run_until_complete(
account_tx_full(args.p2pIp, args.p2pPort, args.account, args.binary))
account_tx_full(args.p2pIp, args.p2pPort, args.account, args.binary, rng[0],rng[1]))
print(compareAccountTx(res,res2))
elif args.action == "ledger_data":
@@ -508,6 +528,12 @@ def run(args):
if args.verify:
writeLedgerData(res,args.filename)
elif args.action == "ledger_data_full":
if args.verify:
args.limit = 2048
args.binary = True
if args.filename is None:
args.filename = str(args.port) + "." + str(args.ledger)
res = asyncio.get_event_loop().run_until_complete(
ledger_data_full(args.ip, args.port, args.ledger, args.binary, args.limit))
if args.verify:
@@ -515,6 +541,10 @@ def run(args):
elif args.action == "ledger":
if args.verify:
args.binary = True
args.transactions = True
args.expand = True
res = asyncio.get_event_loop().run_until_complete(
ledger(args.ip, args.port, args.ledger, args.binary, args.transactions, args.expand))
if args.verify:
@@ -526,6 +556,8 @@ def run(args):
asyncio.get_event_loop().run_until_complete(
ledger_range(args.ip, args.port))
elif args.action == "book_offers":
if args.verify:
args.binary=True
res = asyncio.get_event_loop().run_until_complete(
book_offers(args.ip, args.port, args.ledger, args.taker_pays_currency, args.taker_pays_issuer, args.taker_gets_currency, args.taker_gets_issuer, args.binary))
if args.verify: