Skip to content
Snippets Groups Projects
Commit 00344bd3 authored by inso's avatar inso
Browse files

Fix Membership timestamp

parent 785563c6
Branches
Tags
No related merge requests found
...@@ -4,7 +4,7 @@ Created on 12 déc. 2014 ...@@ -4,7 +4,7 @@ Created on 12 déc. 2014
@author: inso @author: inso
''' '''
import unittest import unittest
from ucoinpy.documents.block import Block from ucoinpy.documents.block import Block, BlockUID
raw_block = """Version: 2 raw_block = """Version: 2
Type: Block Type: Block
...@@ -307,6 +307,12 @@ class Test_Block(unittest.TestCase): ...@@ -307,6 +307,12 @@ class Test_Block(unittest.TestCase):
self.assertEqual(block.signed_raw(), raw_block_with_leavers) self.assertEqual(block.signed_raw(), raw_block_with_leavers)
def test_block_uid__compare(self):
lower = BlockUID(10, "8101618234DBE5AAD529C13C8BE45E2F9BBE1150CD2FAA25095671F56C1DCDA5")
higher = BlockUID(14, "E1C0AD728983D8A57335E52CF1064F1AFFD1D454173D8CEBD3ED8B4A72B48704")
self.assertTrue(lower < higher)
self.assertFalse(lower > higher)
self.assertFalse(lower == higher)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
__all__ = ['api'] __all__ = ['api']
PROTOCOL_VERSION = "1" PROTOCOL_VERSION = 2
import logging import logging
......
...@@ -107,7 +107,7 @@ class Membership(Blockchain): ...@@ -107,7 +107,7 @@ class Membership(Blockchain):
"type": "string", "type": "string",
}, },
"sigDate": { "sigDate": {
"type": "number" "type": "string"
}, },
"memberships": { "memberships": {
"type": "array", "type": "array",
......
...@@ -54,7 +54,7 @@ class Peering(Network): ...@@ -54,7 +54,7 @@ class Peering(Network):
} }
async def __get__(self, session, **kwargs): async def __get__(self, session, **kwargs):
r = await self.requests_get('/peering', **kwargs) r = await self.requests_get(session, '/peering', **kwargs)
return (await self.parse_response(r)) return (await self.parse_response(r))
from . import peering from . import peering
from .block import Block, BlockUID from .block import Block, BlockUID
from .certification import SelfCertification, Certification from .certification import SelfCertification, Certification, Revokation
from .membership import Membership from .membership import Membership
from .peer import Endpoint, BMAEndpoint, UnknownEndpoint, Peer from .peer import Endpoint, BMAEndpoint, UnknownEndpoint, Peer
from .transaction import SimpleTransaction, Transaction from .transaction import SimpleTransaction, Transaction
......
...@@ -49,6 +49,18 @@ class BlockUID: ...@@ -49,6 +49,18 @@ class BlockUID:
def __eq__(self, other): def __eq__(self, other):
return self.number == other.number and self.sha_hash == other.sha_hash return self.number == other.number and self.sha_hash == other.sha_hash
def __lt__(self, other):
return self.number < other.number
def __gt__(self, other):
return self.number > other.number
def __le__(self, other):
return self.number <= other.number
def __ge__(self, other):
return self.number >= other.number
class Block(Document): class Block(Document):
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment