RunasSudo/Eos
1
Fork 0
Code Issues Pull Requests Activity

Fix hashing issues and issues with passing EosLists around

Browse Source 
Caused election hash to change when changing workflow task states
This commit is contained in:
RunasSudo 2017-11-24 18:09:43 +11:00
parent a0949f781b
commit 81807ca7f8
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eos/base/workflow.py
View File

@ -18,6 +18,7 @@ from eos.core.objects import *
class WorkflowTask(EmbeddedObject):
class Status:
UNKNOWN = 0
NOT_READY = 10
READY = 20
ENTERED = 30
@ -27,7 +28,7 @@ class WorkflowTask(EmbeddedObject):
depends_on = []
provides = []
status = IntField()
status = IntField(default=0, is_hashed=False)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@ -37,7 +38,8 @@ class WorkflowTask(EmbeddedObject):
self.workflow = self.recurse_parents(Workflow)
self.status = WorkflowTask.Status.READY if self.are_dependencies_met() else WorkflowTask.Status.NOT_READY
if self.status == WorkflowTask.Status.UNKNOWN:
self.status = WorkflowTask.Status.READY if self.are_dependencies_met() else WorkflowTask.Status.NOT_READY
self.listeners = {
'enter': [],

33
eos/core/objects/__init__.py
View File

@ -62,7 +62,7 @@ class Field:
self.is_hashed = kwargs['is_hashed'] if 'is_hashed' in kwargs else not self.is_protected
class PrimitiveField(Field):
def serialise(self, value):
def serialise(self, value, for_hash=False, should_protect=False):
return value
def deserialise(self, value):
@ -77,8 +77,8 @@ class EmbeddedObjectField(Field):
super().__init__(*args, **kwargs)
self.object_type = object_type
def serialise(self, value):
return EosObject.serialise_and_wrap(value, self.object_type)
def serialise(self, value, for_hash=False, should_protect=False):
return EosObject.serialise_and_wrap(value, self.object_type, for_hash, should_protect)
def deserialise(self, value):
return EosObject.deserialise_and_unwrap(value, self.object_type)
@ -88,8 +88,8 @@ class ListField(Field):
super().__init__(default=EosList, *args, **kwargs)
self.element_field = element_field
def serialise(self, value):
return [self.element_field.serialise(x) for x in value]
def serialise(self, value, for_hash=False, should_protect=False):
return [self.element_field.serialise(x, for_hash, should_protect) for x in value]
def deserialise(self, value):
return [self.element_field.deserialise(x) for x in value]
@ -99,18 +99,20 @@ class EmbeddedObjectListField(Field):
super().__init__(default=EosList, *args, **kwargs)
self.object_type = object_type
def serialise(self, value):
return [EosObject.serialise_and_wrap(x, self.object_type) for x in value]
def serialise(self, value, for_hash=False, should_protect=False):
#return [EosObject.serialise_and_wrap(x, self.object_type, for_hash, should_protect) for x in value]
# TNYI: Doesn't know how to deal with iterators like this
return [EosObject.serialise_and_wrap(x, self.object_type, for_hash, should_protect) for x in value.impl]
def deserialise(self, value):
return [EosObject.deserialise_and_unwrap(x, self.object_type) for x in value]
return EosList([EosObject.deserialise_and_unwrap(x, self.object_type) for x in value])
if is_python:
class UUIDField(Field):
def __init__(self, *args, **kwargs):
super().__init__(default=uuid.uuid4, *args, **kwargs)
def serialise(self, value):
def serialise(self, value, for_hash=False, should_protect=False):
return str(value)
def deserialise(self, value):
@ -143,7 +145,8 @@ class EosObject(metaclass=EosObjectType):
self._inited = True
def recurse_parents(self, cls):
if not isinstance(cls, type):
#if not isinstance(cls, type):
if isinstance(cls, str):
cls = EosObject.objects[cls]
if isinstance(self, cls):
@ -240,12 +243,12 @@ class DocumentObjectType(EosObjectType):
def field_getter(self):
return self._field_values[name]
def field_setter(self, value):
self._field_values[name] = value
if isinstance(value, EosObject):
value._instance = (self, name)
if not value._inited:
value.post_init()
self._field_values[name] = value
return property(field_getter, field_setter)
for attr, val in fields.items():
@ -274,12 +277,12 @@ class DocumentObject(EosObject, metaclass=DocumentObjectType):
def field_getter():
return self._field_values[name]
def field_setter(value):
self._field_values[name] = value
if isinstance(value, EosObject):
value._instance = (self, name)
if not value._inited:
value.post_init()
self._field_values[name] = value
return (field_getter, field_setter)
prop = make_property(attr, val)
# TNYI: No support for property()
@ -298,7 +301,7 @@ class DocumentObject(EosObject, metaclass=DocumentObjectType):
# TNYI: Strange things happen with py_ attributes
def serialise(self, for_hash=False, should_protect=False):
return {(attr[3:] if attr.startswith('py_') else attr): val.serialise(getattr(self, attr)) for attr, val in self._fields.items() if ((val.is_hashed or not for_hash) and (not should_protect or not val.is_protected))}
return {(attr[3:] if attr.startswith('py_') else attr): val.serialise(getattr(self, attr), for_hash, should_protect) for attr, val in self._fields.items() if ((val.is_hashed or not for_hash) and (not should_protect or not val.is_protected))}
@classmethod
def deserialise(cls, value):

3
eosweb/core/templates/election/booth.html
View File

@ -69,7 +69,8 @@
function electionLoaded() {
// Load templates for the question types
for (var question of election.questions) {
for (var i = 0; i < election.questions.__len__(); i++) {
var question = election.questions.__getitem__(i);
templates[selection_model_view_map[question._name]['selections_make']] = null;
templates[selection_model_view_map[question._name]['selections_review']] = null;
}