Skip to content

Commit 5555158

Browse files
committed
Fix tests
1 parent d7fca86 commit 5555158

File tree

5 files changed

+26
-32
lines changed

5 files changed

+26
-32
lines changed

integration-test/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ networks:
99
services:
1010

1111
cardano-node:
12-
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.0}
12+
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.2}
1313
entrypoint: bash
1414
environment:
1515
NETWORK: "${NETWORK:-local-alonzo}"
@@ -32,7 +32,7 @@ services:
3232
max-file: "10"
3333

3434
cardano-pool:
35-
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.0}
35+
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.2}
3636
entrypoint: bash
3737
environment:
3838
NETWORK: "${NETWORK:-local-alonzo}"
@@ -52,7 +52,7 @@ services:
5252
max-file: "10"
5353

5454
ogmios:
55-
image: cardanosolutions/ogmios:v5.5.0
55+
image: cardanosolutions/ogmios:v5.5.2
5656
environment:
5757
NETWORK: "${NETWORK:-local-alonzo}"
5858

integration-test/run_tests.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ poetry install
1010
##########
1111
# Alonzo #
1212
##########
13-
#
14-
## Cleanup containers and volumes in case there is any running
15-
#docker-compose down --volumes --remove-orphans
16-
#
17-
## Run alonzo integration tests
18-
#./bootstrap.sh local-alonzo
19-
#
20-
## Launch containers
21-
#docker-compose up -d
22-
#
23-
#export PAYMENT_KEY="$ROOT"/configs/local-alonzo/shelley/utxo-keys/utxo1.skey
24-
#export EXTENDED_PAYMENT_KEY="$ROOT"/keys/extended.skey
25-
#export POOL_ID=$(cat "$ROOT"/keys/pool/pool.id)
26-
#
27-
## Wait for stake pool to start producing blocks
28-
#sleep 20
29-
#
30-
#poetry run pytest -s -vv -n 4 "$ROOT"/test -m "not (post_alonzo)"
31-
#
32-
## Cleanup
33-
#docker-compose down --volumes --remove-orphans
13+
14+
# Cleanup containers and volumes in case there is any running
15+
docker-compose down --volumes --remove-orphans
16+
17+
# Run alonzo integration tests
18+
./bootstrap.sh local-alonzo
19+
20+
# Launch containers
21+
docker-compose up -d
22+
23+
export PAYMENT_KEY="$ROOT"/configs/local-alonzo/shelley/utxo-keys/utxo1.skey
24+
export EXTENDED_PAYMENT_KEY="$ROOT"/keys/extended.skey
25+
export POOL_ID=$(cat "$ROOT"/keys/pool/pool.id)
26+
27+
# Wait for stake pool to start producing blocks
28+
sleep 20
29+
30+
poetry run pytest -s -vv -n 4 "$ROOT"/test -m "not (post_alonzo)"
31+
32+
# Cleanup
33+
docker-compose down --volumes --remove-orphans
3434

3535
#########
3636
# Vasil #

pycardano/backend/blockfrost.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import argparse
2-
import json
32
import os
43
import tempfile
54
import time

pycardano/txbuilder.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ def _calc_change(
432432
if not change.multi_asset:
433433
if change.coin < min_lovelace_pre_alonzo(change, self.context):
434434
raise InsufficientUTxOBalanceException(
435-
f"Not enough ADA left for change: {change.coin} but needs {min_lovelace_pre_alonzo(change, self.context)}"
435+
f"Not enough ADA left for change: {change.coin} but needs "
436+
f"{min_lovelace_pre_alonzo(change, self.context)}"
436437
)
437438
lovelace_change = change.coin
438439
change_output_arr.append(TransactionOutput(address, lovelace_change))

pycardano/utils.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,16 @@
88
from nacl.encoding import RawEncoder
99
from nacl.hash import blake2b
1010

11-
from pycardano.address import Address
1211
from pycardano.backend.base import ChainContext
1312
from pycardano.hash import (
1413
SCRIPT_DATA_HASH_SIZE,
1514
SCRIPT_HASH_SIZE,
16-
VERIFICATION_KEY_HASH_SIZE,
1715
ScriptDataHash,
18-
VerificationKeyHash,
1916
)
2017
from pycardano.plutus import (
2118
COST_MODELS,
2219
CostModels,
2320
Datum,
24-
NativeScript,
25-
PlutusV1Script,
26-
PlutusV2Script,
2721
Redeemer,
2822
)
2923
from pycardano.serialization import default_encoder

0 commit comments

Comments
 (0)