adjusted to neweest transaction package

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2022-11-28 14:11:07 +01:00
parent 713bd5267c
commit e28dcc31fa
No known key found for this signature in database
7 changed files with 4 additions and 20 deletions

View File

@ -7,7 +7,6 @@ RUN apt-get -qq update \
&& apt-get -y upgrade \ && apt-get -y upgrade \
&& apt-get install -y jq vim zsh build-essential cmake\ && apt-get install -y jq vim zsh build-essential cmake\
&& pip install . \ && pip install . \
&& pip install pynacl==1.4.0 base58==2.1.1 pyasn1==0.4.8 zenroom==2.1.0.dev1655293214 cryptography==3.4.7\
&& apt-get autoremove \ && apt-get autoremove \
&& apt-get clean && apt-get clean

View File

@ -46,7 +46,4 @@ VOLUME /data/db /data/configdb /tendermint
EXPOSE 27017 28017 9984 9985 26656 26657 26658 EXPOSE 27017 28017 9984 9985 26656 26657 26658
RUN pip install pynacl==1.4.0 base58==2.1.1 pyasn1==0.4.8 zenroom==2.1.0.dev1655293214 cryptography==3.4.7
WORKDIR $HOME WORKDIR $HOME

View File

@ -34,4 +34,3 @@ COPY . /usr/src/app/
WORKDIR /usr/src/app WORKDIR /usr/src/app
RUN pip install -e .[dev] RUN pip install -e .[dev]
RUN pip install flask-cors RUN pip install flask-cors
RUN pip install pynacl==1.4.0 base58==2.1.1 pyasn1==0.4.8 zenroom==2.1.0.dev1655293214 cryptography==3.4.7

View File

@ -13,8 +13,6 @@ RUN pip install --upgrade \
pycco \ pycco \
websocket-client~=0.47.0 \ websocket-client~=0.47.0 \
pytest~=3.0 \ pytest~=3.0 \
planetmint-cryptoconditions>=0.10.0\
planetmint-driver>=0.9.2 \ planetmint-driver>=0.9.2 \
blns blns
RUN pip install base58>=2.1.1 pynacl==1.4.0 zenroom==2.1.0.dev1655293214 pyasn1==0.4.8 cryptography==3.4.7
RUN pip install planetmint-ipld>=0.0.3 RUN pip install planetmint-ipld>=0.0.3

View File

@ -15,7 +15,5 @@ RUN pip install --upgrade \
pytest~=6.2.5 \ pytest~=6.2.5 \
pycco \ pycco \
websocket-client~=0.47.0 \ websocket-client~=0.47.0 \
planetmint-cryptoconditions>=0.10.0 \
planetmint-driver>=9.2.0 \ planetmint-driver>=9.2.0 \
blns blns
RUN pip install base58 pynacl==1.4.0 zenroom==2.1.0.dev1655293214 pyasn1==0.4.8 cryptography==3.4.7

View File

@ -111,7 +111,6 @@ install_requires = [
"base58==2.1.1", "base58==2.1.1",
"aiohttp==3.8.1", "aiohttp==3.8.1",
"abci==0.8.3", "abci==0.8.3",
"planetmint-cryptoconditions>=0.10.0",
"flask-cors==3.0.10", "flask-cors==3.0.10",
"flask-restful==0.3.9", "flask-restful==0.3.9",
"flask==2.1.2", "flask==2.1.2",
@ -119,7 +118,6 @@ install_requires = [
"jsonschema==4.16.0", "jsonschema==4.16.0",
"logstats==0.3.0", "logstats==0.3.0",
"packaging>=20.9", "packaging>=20.9",
# TODO Consider not installing the db drivers, or putting them in extras.
"pymongo==3.11.4", "pymongo==3.11.4",
"tarantool==0.7.1", "tarantool==0.7.1",
"python-rapidjson>=1.0", "python-rapidjson>=1.0",
@ -130,14 +128,9 @@ install_requires = [
"nest-asyncio==1.5.5", "nest-asyncio==1.5.5",
"protobuf==3.20.1", "protobuf==3.20.1",
"planetmint-ipld>=0.0.3", "planetmint-ipld>=0.0.3",
"pyasn1",
"zenroom==2.1.0.dev1655293214",
"base58>=2.1.0",
"PyNaCl==1.4.0",
"pyasn1>=0.4.8", "pyasn1>=0.4.8",
"cryptography==3.4.7",
"python-decouple", "python-decouple",
"planetmint-transactions==0.2.0", "planetmint-transactions>=0.2.2",
] ]
setup( setup(

View File

@ -3,7 +3,7 @@ import base58
from hashlib import sha3_256 from hashlib import sha3_256
from zenroom import zencode_exec from zenroom import zencode_exec
from cryptoconditions.types.zenroom import ZenroomSha256 from planetmint_cryptoconditions.types.zenroom import ZenroomSha256
from transactions.common.crypto import generate_key_pair from transactions.common.crypto import generate_key_pair
from ipld import multihash, marshal from ipld import multihash, marshal
@ -32,7 +32,7 @@ GENERATE_KEYPAIR = """Scenario 'ecdh': Create the keypair
Given that I am known as 'Pippo' Given that I am known as 'Pippo'
When I create the ecdh key When I create the ecdh key
When I create the bitcoin key When I create the bitcoin key
Then print data""" Then print keyring"""
INITIAL_STATE = {"also": "more data"} INITIAL_STATE = {"also": "more data"}
SCRIPT_INPUT = { SCRIPT_INPUT = {