diff --git a/duniterpy/api/bma/network.py b/duniterpy/api/bma/network.py index e50ba81131d42d9840dc285fcc651f646b0ace63..d02b22e1a22c6988c1a286fc265034cbad9d89c1 100644 --- a/duniterpy/api/bma/network.py +++ b/duniterpy/api/bma/network.py @@ -168,7 +168,7 @@ WS2P_HEADS_SCHEMA = { "type": "number", }, }, - "required": ["messageV2", "sigV2", "step"] + "required": ["message", "sig"] } } }, diff --git a/duniterpy/documents/ws2p/heads.py b/duniterpy/documents/ws2p/heads.py index 774745e4a54efb0f9ca483e05cc4846dec67272e..ec272a631736a4e50172c355ab3f86c6476f5b34 100644 --- a/duniterpy/documents/ws2p/heads.py +++ b/duniterpy/documents/ws2p/heads.py @@ -154,7 +154,7 @@ class HeadV2: data = HeadV2.re_inline.match(offload) free_member_room = int(data.group(1)) 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): values = (str(v) for v in attr.astuple(self, True, filter=attr.filters.exclude(attr.fields(HeadV2).v1))) diff --git a/tests/api/bma/test_ws2p.py b/tests/api/bma/test_ws2p.py index 408fcc1747bf3cd7d097043ae6d6960859255ebd..3b911b5b9def764046d71159a631b42340eb0b09 100644 --- a/tests/api/bma/test_ws2p.py +++ b/tests/api/bma/test_ws2p.py @@ -45,7 +45,7 @@ class Test_WS2P_Heads(WebFunctionalSetupMixin, unittest.TestCase): return web.Response(body=b'{}', content_type='application/json') 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): async with aiohttp.ClientSession() as session: connection = next(BMAEndpoint("127.0.0.1", None, None, port).conn_handler(session)) diff --git a/tests/documents/test_ws2p_heads.py b/tests/documents/test_ws2p_heads.py index be5f17a222c74f28f83cda3f2155e601624e797e..01424b3791a3429e214f5e25007f9d70cc0d8042 100644 --- a/tests/documents/test_ws2p_heads.py +++ b/tests/documents/test_ws2p_heads.py @@ -19,7 +19,7 @@ class TestWS2PHeads(unittest.TestCase): self.assertEqual(headv0.api.private, "") self.assertEqual(headv0.head.version, 0) 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): @@ -36,7 +36,7 @@ class TestWS2PHeads(unittest.TestCase): self.assertEqual(headv1.pow_prefix, 1) def test_ws2p_headv2(self): - headv2 = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" + headv2, _ = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" "99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:" "duniter:1.6.21:1:20:19", "CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==") diff --git a/tests/key/test_verifying_key.py b/tests/key/test_verifying_key.py index 8d01429c881d0350e471fab1b368427ad08cb5d7..e7b4d0bbdee5e5b2809aade9d5a4fc5e28025732 100644 --- a/tests/key/test_verifying_key.py +++ b/tests/key/test_verifying_key.py @@ -43,7 +43,7 @@ BASIC_MERKLED_API testnet.duniter.inso.ovh 80 self.assertTrue(verifying_key.verify_ws2p_head(headv1)) def test_ws2p_headv2(self): - headv2 = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" + headv2, _ = HeadV2.from_inline("WS2POCA:HEAD:2:D3krfq6J9AmfpKnS3gQVYoy7NzGCc61vokteTS8LJ4YH:" "99393-0000017256006BFA979565F1280488D5831DD66054069E46A3EDEB1AECDBBF13:cb36b021:" "duniter:1.6.21:1:20:19", "CgD1vaImPWZUCDFt5HDHUdjCTFcIwW5ndiCx6kXioFLZoz1a4WhCFYXvjI2N8+jEwQdWtf5+yNoHonqBSqirAQ==")