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

More renaming of payload => data

Browse Source
This commit is contained in:
tim 2016-09-28 14:09:39 +02:00 committed by Sylvain Bellemare
parent 9df7c70720
commit 4390cfb8a9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
transaction.py
View File

@ -10,8 +10,7 @@ from cryptoconditions.exceptions import ParsingError
from bigchaindb_common.crypto import SigningKey, hash_data from bigchaindb_common.crypto import SigningKey, hash_data
from bigchaindb_common.exceptions import (KeypairMismatchException, from bigchaindb_common.exceptions import (KeypairMismatchException,
InvalidHash, InvalidSignature, InvalidHash, InvalidSignature)
AmountError)
from bigchaindb_common.util import serialize, gen_timestamp from bigchaindb_common.util import serialize, gen_timestamp
@ -245,7 +244,6 @@ class Asset(object):
else: else:
self.data = data self.data = data
# TODO: Add ID method here I guess
self.data_id = data_id if data_id is not None else self.to_hash() self.data_id = data_id if data_id is not None else self.to_hash()
self.divisible = divisible self.divisible = divisible
self.updatable = updatable self.updatable = updatable
@ -358,14 +356,14 @@ class Transaction(object):
self.metadata = metadata self.metadata = metadata
@classmethod @classmethod
def create(cls, owners_before, owners_after, payload=None, secret=None, def create(cls, owners_before, owners_after, data=None, secret=None,
time_expire=None): time_expire=None):
if not isinstance(owners_before, list): if not isinstance(owners_before, list):
raise TypeError('`owners_before` must be a list instance') raise TypeError('`owners_before` must be a list instance')
if not isinstance(owners_after, list): if not isinstance(owners_after, list):
raise TypeError('`owners_after` must be a list instance') raise TypeError('`owners_after` must be a list instance')
metadata = Metadata(payload) metadata = Metadata(data)
if len(owners_before) == len(owners_after) and len(owners_after) == 1: if len(owners_before) == len(owners_after) and len(owners_after) == 1:
# NOTE: Standard case, one owner before, one after. # NOTE: Standard case, one owner before, one after.
# NOTE: For this case its sufficient to use the same # NOTE: For this case its sufficient to use the same
@ -414,7 +412,7 @@ class Transaction(object):
raise ValueError("These are not the cases you're looking for ;)") raise ValueError("These are not the cases you're looking for ;)")
@classmethod @classmethod
def transfer(cls, inputs, owners_after, payload=None): def transfer(cls, inputs, owners_after, data=None):
if not isinstance(inputs, list): if not isinstance(inputs, list):
raise TypeError('`inputs` must be a list instance') raise TypeError('`inputs` must be a list instance')
if len(inputs) == 0: if len(inputs) == 0:
@ -450,7 +448,7 @@ class Transaction(object):
raise ValueError("`inputs` and `owners_after`'s count must be the " raise ValueError("`inputs` and `owners_after`'s count must be the "
"same") "same")
metadata = Metadata(payload) metadata = Metadata(data)
inputs = deepcopy(inputs) inputs = deepcopy(inputs)
return cls(cls.TRANSFER, inputs, conditions, metadata) return cls(cls.TRANSFER, inputs, conditions, metadata)