Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

short form 0.9, 0.10 etc tx version with no '.dev' suffix

Browse Source
This commit is contained in:
Scott Sadler 2017-01-23 15:16:15 +01:00
parent e7ffcf5705
commit ccdbb91c1c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/common/transaction.py
View File

@ -410,7 +410,7 @@ class Transaction(object):
TRANSFER = 'TRANSFER' TRANSFER = 'TRANSFER'
GENESIS = 'GENESIS' GENESIS = 'GENESIS'
ALLOWED_OPERATIONS = (CREATE, TRANSFER, GENESIS) ALLOWED_OPERATIONS = (CREATE, TRANSFER, GENESIS)
VERSION = bigchaindb.version.__version__ VERSION = bigchaindb.version.__short_version__[:-4] # 0.9, 0.10 etc
def __init__(self, operation, asset, inputs=None, outputs=None, def __init__(self, operation, asset, inputs=None, outputs=None,
metadata=None, version=None): metadata=None, version=None):

4
tests/common/test_transaction.py
View File

@ -966,11 +966,13 @@ def test_cant_add_empty_input():
def test_validate_version(utx): def test_validate_version(utx):
import re
import bigchaindb.version import bigchaindb.version
from .utils import validate_transaction_model from .utils import validate_transaction_model
from bigchaindb.common.exceptions import SchemaValidationError from bigchaindb.common.exceptions import SchemaValidationError
assert utx.version == bigchaindb.version.__version__ short_ver = bigchaindb.version.__short_version__
assert utx.version == re.match(r'^(.*\d)', short_ver).group(1)
validate_transaction_model(utx) validate_transaction_model(utx)