From 0a53fd923796e2898461044c9b0d172e8ecd654e Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Tue, 4 Oct 2022 14:06:20 -0600 Subject: [PATCH] Use slickrpc instead of the authproxy from rpc-tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes the cross-repo dependency. The README change doesn’t indicate a new dependency, the existing code was already depending on slick-bitcoinrpc. --- README.md | 4 ++++ analysis/analyze.py | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8a9becf..a627481 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # zcash-graphs A collection of scripts for collecting and graphing data about the Zcash chain + +## dependencies + +- `slick-bitcoinrpc` (which depends on `libssl-dev` and `libcurl4-openssl-dev`) diff --git a/analysis/analyze.py b/analysis/analyze.py index c74ae26..8c23ee9 100755 --- a/analysis/analyze.py +++ b/analysis/analyze.py @@ -16,17 +16,10 @@ import math import numpy as np import os.path from progress.bar import IncrementalBar +from slickrpc.rpc import Proxy from statistics import mean import sys -sys.path.insert( - 1, - os.path.join(os.path.dirname(os.path.abspath(__file__)), - "../../qa/rpc-tests") -) - -from test_framework.authproxy import AuthServiceProxy - ### TODO: Get host/port from config if len(sys.argv) > 1: connection_string = sys.argv[1] @@ -146,7 +139,7 @@ class Analysis: class Analyzer: def __init__(self, node_url): - self.node = AuthServiceProxy(node_url) + self.node = Proxy(node_url) def analyze_blocks(self, block_range, analyses): """