Skip to content

Commit

Permalink
fix pytest
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ouziel
Ouziel committed Dec 31, 2024
1 parent 2abe695 commit 44a6c2b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 39 deletions.
3 changes: 2 additions & 1 deletion counterparty-core/counterpartycore/lib/backend/bitcoind.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def rpc_call(payload, retry=0):


def is_api_request():
print("is_api_request", current_process().name)
if current_process().name != "API":
return False
thread_name = current_thread().name
Expand Down Expand Up @@ -456,7 +457,7 @@ def list_unspent(source, allow_unconfirmed_inputs):
min_conf = 0 if allow_unconfirmed_inputs else 1
bitcoind_unspent_list = []
try:
bitcoind_unspent_list = rpc("listunspent", [min_conf, 9999999, [source]]) or []
bitcoind_unspent_list = safe_rpc("listunspent", [min_conf, 9999999, [source]]) or []
except exceptions.BitcoindRPCError:
pass

Expand Down
76 changes: 38 additions & 38 deletions counterparty-core/counterpartycore/test/fixtures/api_v2_fixtures.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12526,14 +12526,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -12779,14 +12779,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -13014,14 +13014,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -13256,14 +13256,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -13491,14 +13491,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -13738,14 +13738,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -14011,14 +14011,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -14258,14 +14258,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -14534,14 +14534,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -14809,14 +14809,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -15074,14 +15074,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -15342,14 +15342,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -15589,14 +15589,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -15830,14 +15830,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -16177,14 +16177,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -16419,14 +16419,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -16667,14 +16667,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -16903,14 +16903,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down Expand Up @@ -17138,14 +17138,14 @@
{
"name": "regular_dust_size",
"type": "int",
"default": 546,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
{
"name": "multisig_dust_size",
"type": "int",
"default": 1000,
"default": null,
"description": "Deprecated, automatically calculated",
"required": false
},
Expand Down

0 comments on commit 44a6c2b

Please sign in to comment.