From c42c10cb32817e4bcacace7eed615f5698baa83c Mon Sep 17 00:00:00 2001 From: Patrick O'Grady Date: Mon, 26 Oct 2020 18:43:05 -0700 Subject: [PATCH] Tests passing --- .gitignore | 1 + rosetta-cli-conf/mainnet/config.json | 5 ++++- rosetta-cli-conf/testnet/bitcoin.ros | 6 +++--- rosetta-cli-conf/testnet/config.json | 5 ++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2fab13c..5ded4fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ rosetta-bitcoin bitcoin-data +cli-data diff --git a/rosetta-cli-conf/mainnet/config.json b/rosetta-cli-conf/mainnet/config.json index dfbbfce..2c0b8f5 100644 --- a/rosetta-cli-conf/mainnet/config.json +++ b/rosetta-cli-conf/mainnet/config.json @@ -28,7 +28,10 @@ "balance_tracking_disabled": false, "coin_tracking_disabled": false, "end_conditions": { - "reconciliation_coverage": 0.95 + "reconciliation_coverage": { + "coverage": 0.95, + "from_tip": true + } }, "results_output_file": "" } diff --git a/rosetta-cli-conf/testnet/bitcoin.ros b/rosetta-cli-conf/testnet/bitcoin.ros index 4092080..bae952c 100644 --- a/rosetta-cli-conf/testnet/bitcoin.ros +++ b/rosetta-cli-conf/testnet/bitcoin.ros @@ -1,4 +1,4 @@ -request_funds(1) { +request_funds(1){ find_account{ currency = {"symbol":"tBTC", "decimals":8}; random_account = find_balance({ @@ -142,7 +142,7 @@ transfer(10){ "amount":{"value":{{change_amount}},"currency":{{currency}}} } ]; - }, + } } return_funds(10){ @@ -213,5 +213,5 @@ return_funds(10){ "amount":{"value":{{recipient_amount}},"currency":{{currency}}} } ]; - }, + } } diff --git a/rosetta-cli-conf/testnet/config.json b/rosetta-cli-conf/testnet/config.json index e0e649c..7591bb5 100644 --- a/rosetta-cli-conf/testnet/config.json +++ b/rosetta-cli-conf/testnet/config.json @@ -43,7 +43,10 @@ "balance_tracking_disabled": false, "coin_tracking_disabled": false, "end_conditions": { - "reconciliation_coverage": 0.95 + "reconciliation_coverage": { + "coverage": 0.95, + "from_tip": true + } }, "results_output_file": "" }