From acd7d527e4d915b368c3ea1779b21299ce4deaae Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 15:10:29 +0200 Subject: [PATCH 1/6] added clock to rumorJson --- protocol/examples/answer/rumor_state_ans.json | 12 ++++++++++++ protocol/examples/query/rumor/rumor.json | 6 ++++++ protocol/query/method/object/rumor.json | 7 ++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/protocol/examples/answer/rumor_state_ans.json b/protocol/examples/answer/rumor_state_ans.json index d00ea14e9e..2205f33ef6 100644 --- a/protocol/examples/answer/rumor_state_ans.json +++ b/protocol/examples/answer/rumor_state_ans.json @@ -5,6 +5,12 @@ { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 9 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { @@ -20,6 +26,12 @@ { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 2, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/HnXDyvSSron676Icmvcjk5zXvGLkPJ1fVOaWOxItzBE=": [ { diff --git a/protocol/examples/query/rumor/rumor.json b/protocol/examples/query/rumor/rumor.json index bb8744fce7..56741b33d4 100644 --- a/protocol/examples/query/rumor/rumor.json +++ b/protocol/examples/query/rumor/rumor.json @@ -5,6 +5,12 @@ "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { diff --git a/protocol/query/method/object/rumor.json b/protocol/query/method/object/rumor.json index 5f6b38a148..3e9d4d6d08 100644 --- a/protocol/query/method/object/rumor.json +++ b/protocol/query/method/object/rumor.json @@ -15,6 +15,10 @@ "description": "[Integer] ID of the rumor", "type": "integer" }, + "clock" : { + "description": "Rumor state in which this message has been sent", + "$ref": "./rumor_state.json" + }, "messages": { "description": "Key-value of channels and messages per channel", "type": "object", @@ -24,6 +28,7 @@ "required": [ "sender_id", "rumor_id", - "messages" + "messages", + "clock" ] } \ No newline at end of file From cf9b3865ff12848c026c41a58725e0a83e29eecb Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 15:15:56 +0200 Subject: [PATCH 2/6] updated doc --- docs/embedme.sh | 6 +++--- docs/protocol.md | 49 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/docs/embedme.sh b/docs/embedme.sh index 84f273c162..c0150916ac 100755 --- a/docs/embedme.sh +++ b/docs/embedme.sh @@ -34,7 +34,7 @@ BEGIN { { # if this is a closing block line, unsets the del variable to stop deleting # lines if it was the case - if ($0 ~ /^\`\`\`$/) { + if ($0 ~ /^```$/) { del=0; print $0; @@ -44,7 +44,7 @@ BEGIN { # if this is the start of an opening block, we indicate that with the # last_line variable - } else if ($0 ~ /\`\`\`json5/) { + } else if ($0 ~ /```json5/) { last_line=1; print $0; @@ -76,4 +76,4 @@ BEGIN { } END { -} \ No newline at end of file +} diff --git a/docs/protocol.md b/docs/protocol.md index 9b1394baaf..f371f27108 100644 --- a/docs/protocol.md +++ b/docs/protocol.md @@ -197,6 +197,9 @@ and its arguments (`params`). }, { "$ref": "method/rumor_state.json" + }, + { + "$ref": "method/paged_catchup.json" } ], @@ -235,15 +238,15 @@ Notification ```json5 // ../protocol/examples/query/greet_server/greet_server.json -{ - "jsonrpc": "2.0", - "method": "greet_server", - "params": { - "public_key": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", - "client_address": "wss://popdemo.dedis.ch:9000/client", - "server_address": "wss://popdemo.dedis.ch:9001/server" - } -} +{ + "jsonrpc": "2.0", + "method": "greet_server", + "params": { + "public_key": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", + "client_address": "wss://popdemo.dedis.ch:9000/client", + "server_address": "wss://popdemo.dedis.ch:9001/server" + } +} ``` @@ -982,6 +985,12 @@ RPC "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { @@ -1072,6 +1081,10 @@ RPC "description": "[Integer] ID of the rumor", "type": "integer" }, + "clock" : { + "description": "Rumor state in which this message has been sent", + "$ref": "./rumor_state.json" + }, "messages": { "description": "Key-value of channels and messages per channel", "type": "object", @@ -1081,7 +1094,8 @@ RPC "required": [ "sender_id", "rumor_id", - "messages" + "messages", + "clock" ] } @@ -1127,6 +1141,12 @@ Response in case of success { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 9 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { @@ -1142,6 +1162,12 @@ Response in case of success { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 2, + "clock" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/HnXDyvSSron676Icmvcjk5zXvGLkPJ1fVOaWOxItzBE=": [ { @@ -1273,8 +1299,7 @@ Response (in case of success) "signature": "ONylxgHA9cbsB_lwdfbn3iyzRd4aTpJhBMnvEKhmJF_niE_pUHdmjxDXjEwFyvo5WiH1NZXWyXG27SYEpkasCA==", "message_id": "2mAAevx61TZJi4groVGqqkeLEQq0e-qM6PGmTWuShyY=", "witness_signatures": [] - }, - // ...9 other messages + } ] } From 30deb02cd84961d16f200addc5051f79133eaa1a Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 15:24:19 +0200 Subject: [PATCH 3/6] revert embedme.sh --- docs/embedme.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/embedme.sh b/docs/embedme.sh index c0150916ac..f0492e3074 100755 --- a/docs/embedme.sh +++ b/docs/embedme.sh @@ -34,7 +34,7 @@ BEGIN { { # if this is a closing block line, unsets the del variable to stop deleting # lines if it was the case - if ($0 ~ /^```$/) { + if ($0 ~ /^\`\`\`$/) { del=0; print $0; @@ -44,7 +44,7 @@ BEGIN { # if this is the start of an opening block, we indicate that with the # last_line variable - } else if ($0 ~ /```json5/) { + } else if ($0 ~ /\`\`\`json5/) { last_line=1; print $0; From 43d35ea062f5c0bc49c5971e444f74507f19ac8d Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 15:46:31 +0200 Subject: [PATCH 4/6] change to timestamp --- docs/protocol.md | 10 +++++----- protocol/examples/answer/rumor_state_ans.json | 4 ++-- protocol/examples/query/rumor/rumor.json | 2 +- protocol/query/method/object/rumor.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/protocol.md b/docs/protocol.md index f371f27108..18d810adec 100644 --- a/docs/protocol.md +++ b/docs/protocol.md @@ -985,7 +985,7 @@ RPC "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, @@ -1081,7 +1081,7 @@ RPC "description": "[Integer] ID of the rumor", "type": "integer" }, - "clock" : { + "timestamp" : { "description": "Rumor state in which this message has been sent", "$ref": "./rumor_state.json" }, @@ -1095,7 +1095,7 @@ RPC "sender_id", "rumor_id", "messages", - "clock" + "timestamp" ] } @@ -1141,7 +1141,7 @@ Response in case of success { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, @@ -1162,7 +1162,7 @@ Response in case of success { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 2, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, diff --git a/protocol/examples/answer/rumor_state_ans.json b/protocol/examples/answer/rumor_state_ans.json index 2205f33ef6..987f6603bb 100644 --- a/protocol/examples/answer/rumor_state_ans.json +++ b/protocol/examples/answer/rumor_state_ans.json @@ -5,7 +5,7 @@ { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, @@ -26,7 +26,7 @@ { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 2, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, diff --git a/protocol/examples/query/rumor/rumor.json b/protocol/examples/query/rumor/rumor.json index 56741b33d4..b04e3e84eb 100644 --- a/protocol/examples/query/rumor/rumor.json +++ b/protocol/examples/query/rumor/rumor.json @@ -5,7 +5,7 @@ "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, - "clock" : { + "timestamp" : { "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, diff --git a/protocol/query/method/object/rumor.json b/protocol/query/method/object/rumor.json index 3e9d4d6d08..0f7c5cec9a 100644 --- a/protocol/query/method/object/rumor.json +++ b/protocol/query/method/object/rumor.json @@ -15,7 +15,7 @@ "description": "[Integer] ID of the rumor", "type": "integer" }, - "clock" : { + "timestamp" : { "description": "Rumor state in which this message has been sent", "$ref": "./rumor_state.json" }, @@ -29,6 +29,6 @@ "sender_id", "rumor_id", "messages", - "clock" + "timestamp" ] } \ No newline at end of file From 3f3c8b508802015fc378f1b1b7461227903c24a7 Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 16:08:33 +0200 Subject: [PATCH 5/6] corrected states --- protocol/examples/answer/rumor_state_ans.json | 4 ++-- protocol/examples/query/rumor/rumor.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/protocol/examples/answer/rumor_state_ans.json b/protocol/examples/answer/rumor_state_ans.json index 987f6603bb..14a93d7353 100644 --- a/protocol/examples/answer/rumor_state_ans.json +++ b/protocol/examples/answer/rumor_state_ans.json @@ -6,7 +6,7 @@ "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, "timestamp" : { - "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 9 @@ -27,7 +27,7 @@ "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 2, "timestamp" : { - "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 2, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 diff --git a/protocol/examples/query/rumor/rumor.json b/protocol/examples/query/rumor/rumor.json index b04e3e84eb..1a2075f108 100644 --- a/protocol/examples/query/rumor/rumor.json +++ b/protocol/examples/query/rumor/rumor.json @@ -6,7 +6,7 @@ "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, "timestamp" : { - "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 3, + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 From d858b3121827229d5c2bb1062f9f99eaf2483f92 Mon Sep 17 00:00:00 2001 From: Daniel Tavares Agostinho Date: Fri, 14 Jun 2024 16:12:55 +0200 Subject: [PATCH 6/6] update examples --- .../rumor/wrong_rumor_additional_params.json | 6 ++++ .../rumor/wrong_rumor_missing_channel.json | 6 ++++ .../rumor/wrong_rumor_missing_messages.json | 8 ++++- .../rumor/wrong_rumor_missing_rumor_id.json | 6 ++++ .../rumor/wrong_rumor_missing_sender_id.json | 6 ++++ .../rumor/wrong_rumor_missing_timestamp.json | 35 +++++++++++++++++++ 6 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 protocol/examples/query/rumor/wrong_rumor_missing_timestamp.json diff --git a/protocol/examples/query/rumor/wrong_rumor_additional_params.json b/protocol/examples/query/rumor/wrong_rumor_additional_params.json index abae1290f8..893f1fddc6 100644 --- a/protocol/examples/query/rumor/wrong_rumor_additional_params.json +++ b/protocol/examples/query/rumor/wrong_rumor_additional_params.json @@ -5,6 +5,12 @@ "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "timestamp" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { diff --git a/protocol/examples/query/rumor/wrong_rumor_missing_channel.json b/protocol/examples/query/rumor/wrong_rumor_missing_channel.json index 5aff3ebfda..9ee547ff6b 100644 --- a/protocol/examples/query/rumor/wrong_rumor_missing_channel.json +++ b/protocol/examples/query/rumor/wrong_rumor_missing_channel.json @@ -5,6 +5,12 @@ "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", "rumor_id": 1, + "timestamp" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "": [ { diff --git a/protocol/examples/query/rumor/wrong_rumor_missing_messages.json b/protocol/examples/query/rumor/wrong_rumor_missing_messages.json index 5eec6bf0c9..e1f0c7025d 100644 --- a/protocol/examples/query/rumor/wrong_rumor_missing_messages.json +++ b/protocol/examples/query/rumor/wrong_rumor_missing_messages.json @@ -4,6 +4,12 @@ "method": "rumor", "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", - "rumor_id": 1 + "rumor_id": 1, + "timestamp" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + } } } diff --git a/protocol/examples/query/rumor/wrong_rumor_missing_rumor_id.json b/protocol/examples/query/rumor/wrong_rumor_missing_rumor_id.json index 3085736401..60d03d8657 100644 --- a/protocol/examples/query/rumor/wrong_rumor_missing_rumor_id.json +++ b/protocol/examples/query/rumor/wrong_rumor_missing_rumor_id.json @@ -4,6 +4,12 @@ "method": "rumor", "params": { "sender_id": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", + "timestamp" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { diff --git a/protocol/examples/query/rumor/wrong_rumor_missing_sender_id.json b/protocol/examples/query/rumor/wrong_rumor_missing_sender_id.json index 0fa68d0e9d..fa0e6e76ee 100644 --- a/protocol/examples/query/rumor/wrong_rumor_missing_sender_id.json +++ b/protocol/examples/query/rumor/wrong_rumor_missing_sender_id.json @@ -4,6 +4,12 @@ "method": "rumor", "params": { "rumor_id": 1, + "timestamp" : { + "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=": 1, + "RZOPi59Iy5gkpS2mkpfQJNl44HKc2jVbF0iTGm0RvfU=": 5, + "CfG2ByLhtLJH--T2BL9hZ6eGm11tpkE-5KuvysSCY0I=": 1, + "r8cG9HyJ1FGBke_5IblCdH19mvy39MvLFSArVmY3FpY=": 10 + }, "messages": { "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ { diff --git a/protocol/examples/query/rumor/wrong_rumor_missing_timestamp.json b/protocol/examples/query/rumor/wrong_rumor_missing_timestamp.json new file mode 100644 index 0000000000..0fa68d0e9d --- /dev/null +++ b/protocol/examples/query/rumor/wrong_rumor_missing_timestamp.json @@ -0,0 +1,35 @@ +{ + "jsonrpc": "2.0", + "id": 4, + "method": "rumor", + "params": { + "rumor_id": 1, + "messages": { + "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/social/8qlv4aUT5-tBodKp4RszY284CFYVaoDZK6XKiw9isSw=": [ + { + "data": "eyJvYmplY3QiOiJyb2xsX2NhbGwiLCJhY3Rpb24iOiJjcmVhdGUiLCJuYW1lIjoiUm9sbCBDYWxsIiwiY3JlYXRpb24iOjE2MzMwMzYxMjAsInByb3Bvc2VkX3N0YXJ0IjoxNjMzMDM2Mzg4LCJwcm9wb3NlZF9lbmQiOjE2MzMwMzk2ODgsImxvY2F0aW9uIjoiRVBGTCIsImlkIjoial9kSmhZYnpubXZNYnVMc0ZNQ2dzYlB5YjJ6Nm1vZ2VtSmFON1NWaHVVTT0ifQ==", + "sender": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", + "signature": "FFqBXhZSaKvBnTvrDNIeEYMpFKI5oIa5SAewquxIBHTTEyTIDnUgmvkwgccV9NrujPwDnRt1f4CIEqzXqhbjCw==", + "message_id": "DCBX48EuNO6q-Sr42ONqsj7opKiNeXyRzrjqTbZ_aMI=", + "witness_signatures": [] + } + ], + "/root/nLghr9_P406lfkMjaNWqyohLxOiGlQee8zad4qAfj18=/HnXDyvSSron676Icmvcjk5zXvGLkPJ1fVOaWOxItzBE=": [ + { + "data": "eyJvYmplY3QiOiJyb2xsX2NhbGwiLCJhY3Rpb24iOiJjcmVhdGUiLCJuYW1lIjoiUm9sbCBDYWxsIiwiY3JlYXRpb24iOjE2MzMwMzYxMjAsInByb3Bvc2VkX3N0YXJ0IjoxNjMzMDM2Mzg4LCJwcm9wb3NlZF9lbmQiOjE2MzMwMzk2ODgsImxvY2F0aW9uIjoiRVBGTCIsImlkIjoial9kSmhZYnpubXZNYnVMc0ZNQ2dzYlB5YjJ6Nm1vZ2VtSmFON1NWaHVVTT0ifQ==", + "sender": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", + "signature": "FFqBXhZSaKvBnTvrDNIeEYMpFKI5oIa5SAewquxIBHTTEyTIDnUgmvkwgccV9NrujPwDnRt1f4CIEqzXqhbjCw==", + "message_id": "z6SbjJ0Hw36k8L09-GVRq4PNmi06yQX4e8aZRSbUDwc=", + "witness_signatures": [] + }, + { + "data": "eyJvYmplY3QiOiJyb2xsX2NhbGwiLCJhY3Rpb24iOiJjcmVhdGUiLCJuYW1lIjoiUm9sbCBDYWxsIiwiY3JlYXRpb24iOjE2MzMwMzYxMjAsInByb3Bvc2VkX3N0YXJ0IjoxNjMzMDM2Mzg4LCJwcm9wb3NlZF9lbmQiOjE2MzMwMzk2ODgsImxvY2F0aW9uIjoiRVBGTCIsImlkIjoial9kSmhZYnpubXZNYnVMc0ZNQ2dzYlB5YjJ6Nm1vZ2VtSmFON1NWaHVVTT0ifQ==", + "sender": "J9fBzJV70Jk5c-i3277Uq4CmeL4t53WDfUghaK0HpeM=", + "signature": "FFqBXhZSaKvBnTvrDNIeEYMpFKI5oIa5SAewquxIBHTTEyTIDnUgmvkwgccV9NrujPwDnRt1f4CIEqzXqhbjCw==", + "message_id": "txbTmVMwCDkZdoaAiEYfAKozVizZzkeMkeOlzq5qMlg=", + "witness_signatures": [] + } + ] + } + } +}