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

Merge branch 'v0.12'

parents f6950e9a b2c12cfd
No related branches found
Tags 0.13.1
No related merge requests found
......@@ -189,14 +189,14 @@ class Test_BMA_Blockchain(WebFunctionalSetupMixin, unittest.TestCase):
"sigDate": 1421787800,
"memberships": [
{
"version": "1",
"version": 1,
"currency": "meta_brouzouf",
"membership": "IN",
"blockNumber": 0,
"blockHash": "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
},
{
"version": "1",
"version": 1,
"currency": "meta_brouzouf",
"membership": "IN",
"blockNumber": 31658,
......
......@@ -21,7 +21,7 @@ PROTOCOL_VERSION="1"
MANAGED_API=["BASIC_MERKLED_API"]
__author__ = 'Caner Candan & inso'
__version__ = '0.13.0'
__version__ = '0.13.1'
__nonsense__ = 'uCoin'
from . import api, documents, key
\ No newline at end of file
......@@ -81,6 +81,7 @@ class Parameters(Blockchain):
"required": ["currency", "c", "dt", "ud0","sigDelay","sigValidity","sigQty","sigWoT","msValidity",
"stepMax", "medianTimeBlocks", "avgGenTime", "dtDiffEval", "blocksRot", "percentRot"]
}
async def __get__(self, **kwargs):
r = await self.requests_get('/parameters', **kwargs)
return (await self.parse(r))
......@@ -107,7 +108,7 @@ class Membership(Blockchain):
"type": "object",
"properties": {
"version": {
"type": "string"
"type": "number"
},
"currency": {
"type": "string"
......@@ -116,7 +117,7 @@ class Membership(Blockchain):
"type": "string"
},
"blockNumber": {
"type": "number",
"type": "number"
},
"blockHash": {
"type": "string"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment