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

Fix some syntax mistakes

parent 9174b01a
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -168,7 +168,7 @@ WS2P_HEADS_SCHEMA = { ...@@ -168,7 +168,7 @@ WS2P_HEADS_SCHEMA = {
"type": "number", "type": "number",
}, },
}, },
"required": ["messageV2", "sigV2", "step"] "required": ["message", "sig"]
} }
} }
}, },
......
...@@ -154,7 +154,7 @@ class HeadV2: ...@@ -154,7 +154,7 @@ class HeadV2:
data = HeadV2.re_inline.match(offload) data = HeadV2.re_inline.match(offload)
free_member_room = int(data.group(1)) free_member_room = int(data.group(1))
free_mirror_room = int(data.group(2)) free_mirror_room = int(data.group(2))
return cls(v1, free_member_room, free_mirror_room) return cls(v1, free_member_room, free_mirror_room), ""
def inline(self): def inline(self):
values = (str(v) for v in attr.astuple(self, True, filter=attr.filters.exclude(attr.fields(HeadV2).v1))) values = (str(v) for v in attr.astuple(self, True, filter=attr.filters.exclude(attr.fields(HeadV2).v1)))
......
...@@ -45,7 +45,7 @@ class Test_WS2P_Heads(WebFunctionalSetupMixin, unittest.TestCase): ...@@ -45,7 +45,7 @@ class Test_WS2P_Heads(WebFunctionalSetupMixin, unittest.TestCase):
return web.Response(body=b'{}', content_type='application/json') return web.Response(body=b'{}', content_type='application/json')
async def go(): async def go():
_, port, url = await self.create_server('GET', '/ws2p/heads', handler) _, port, url = await self.create_server('GET', '/network/ws2p/heads', handler)
with self.assertRaises(jsonschema.ValidationError): with self.assertRaises(jsonschema.ValidationError):
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
connection = next(BMAEndpoint("127.0.0.1", None, None, port).conn_handler(session)) connection = next(BMAEndpoint("127.0.0.1", None, None, port).conn_handler(session))
......
...@@ -19,7 +19,7 @@ class TestWS2PHeads(unittest.TestCase): ...@@ -19,7 +19,7 @@ class TestWS2PHeads(unittest.TestCase):
self.assertEqual(headv0.api.private, "") self.assertEqual(headv0.api.private, "")
self.assertEqual(headv0.head.version, 0) self.assertEqual(headv0.head.version, 0)
self.assertEqual(headv0.pubkey, "3dnbnYY9i2bHMQUGyFp5GVvJ2wBkVpus31cDJA5cfRpj") self.assertEqual(headv0.pubkey, "3dnbnYY9i2bHMQUGyFp5GVvJ2wBkVpus31cDJA5cfRpj")
self.assertEqual(headv0.blockstamp, "54813-00000A24802B33B71A91B6E990038C145A4815A45C71E57B2F2EF393183C7E2C") self.assertEqual(headv0.blockstamp, BlockUID.from_str("54813-00000A24802B33B71A91B6E990038C145A4815A45C71E57B2F2EF393183C7E2C"))
def test_ws2p_headv1(self): def test_ws2p_headv1(self):
...@@ -36,7 +36,7 @@ class TestWS2PHeads(unittest.TestCase): ...@@ -36,7 +36,7 @@ class TestWS2PHeads(unittest.TestCase):
self.assertEqual(headv1.pow_prefix, 1) self.assertEqual(headv1.pow_prefix, 1)
def test_ws2p_headv2(self): def test_ws2p_headv2(self):
headv2 = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" headv2, _ = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:"
"99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:" "99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:"
"duniter:1.6.21:1:20:19", "duniter:1.6.21:1:20:19",
"CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==") "CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==")
......
...@@ -43,7 +43,7 @@ BASIC_MERKLED_API testnet.duniter.inso.ovh 80 ...@@ -43,7 +43,7 @@ BASIC_MERKLED_API testnet.duniter.inso.ovh 80
self.assertTrue(verifying_key.verify_ws2p_head(headv1)) self.assertTrue(verifying_key.verify_ws2p_head(headv1))
def test_ws2p_headv2(self): def test_ws2p_headv2(self):
headv2 = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" headv2, _ = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:"
"99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:" "99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:"
"duniter:1.6.21:1:20:19", "duniter:1.6.21:1:20:19",
"CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==") "CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment