cryptix/caberl - Change WHYWDNSL67TTB2AGAUACXERJ6X54YMNYVC32KJQFEXFFRYA4K3HQC

add decode_channel_time_range_request

Created by Henry on October 9, 2023

WHYWDNSL67TTB2AGAUACXERJ6X54YMNYVC32KJQFEXFFRYA4K3HQC

Dependencies

[2] 755UGKECZ3PFYEA2TFFOUZTF27CRQTBZWO7UYFU6WQDJMZDBVPRAC

In channels

main

Change contents

Deletion in test/cable_basic_SUITE.erl at line 2 [2.22]

B:BD[2.51] → [2.51:121]


-import(proplists, [get_value/2,
                    get_value/3]).

Deletion in test/cable_basic_SUITE.erl at line 3 [2.22]
B:BD[2.122] → [2.122:168]
```
% -include_lib("common_test/include/ct.hrl").
```
Deletion in test/cable_basic_SUITE.erl at line 4 [2.22]
B:BD[2.209] → [2.209:252]
```
% -include_lib("cable/include/types.hrl").
```

Replacement in test/cable_basic_SUITE.erl at line 6 [2.22]

B:BD[2.277] → [2.277:641]

    TestData = testrecs:test_hash_response(),
    TestObj = proplists:get_value(obj, TestData),
    Bin = proplists:get_value(binary, TestData),
    Header = wire:decode_response_header(Bin),
    ?assert(proplists:get_value(msgLen, Header) == maps:get(<<"msgLen">>, TestObj)),
    ?assert(proplists:get_value(msgType, Header) == maps:get(<<"msgType">>, TestObj)),

[2.277]

[2.641]

    [{binary, Bin}, {obj, TestObj}] = examples:hash_response(),
    [{header, Header},  {ttl, Ttl}, {hashes, Hashes}] = wire:decode_hash_response(Bin),
    ?assert(proplists:get_value(msgLen, Header) =:= maps:get(<<"msgLen">>, TestObj)),
    ?assert(proplists:get_value(msgType, Header) =:= maps:get(<<"msgType">>, TestObj)),

Replacement in test/cable_basic_SUITE.erl at line 11 [2.22]

B:BD[2.720] → [2.720:782]

    ?assert(proplists:get_value(requestId, Header) == ReqId).

[2.720]

[2.782]

    ?assert(proplists:get_value(requestId, Header) =:= ReqId),
    ?assert(Ttl =:= 1),
    ?assert(length(Hashes) =:= 3).

Replacement in test/cable_basic_SUITE.erl at line 16 [2.22]

B:BD[2.784] → [2.784:1132]

% ping_test(Config) ->
%     Host = get_value(hostname, Config, "localhost"),
%     {ok, NewSbotClient} = ssb_client:start_link(Host, remote_long_pk()),
%     Now = erlang:system_time(millisecond),
%     Time = ssb_client:send(NewSbotClient, ping()),
%     End = binary_to_integer(jiffy:decode(Time)),
%     ?assert((End - Now) < 5),
%     Config.

[2.784]

[2.1132]

cancel_request_test() ->
    [{binary, Bin}, {obj, TestObj}] = examples:cancel_request(),
    [{header, Header}, {ttl, Ttl}, {cancelid, CancelId}] = wire:decode_cancel_request(Bin),
    ?assert(proplists:get_value(msgLen, Header) =:= maps:get(<<"msgLen">>, TestObj)),
    ?assert(proplists:get_value(msgType, Header) =:= maps:get(<<"msgType">>, TestObj)),
    CancelId = hex:hexstr_to_bin(binary_to_list(maps:get(<<"cancelid">>, TestObj))),
    ReqId = hex:hexstr_to_bin(binary_to_list(maps:get(<<"reqid">>, TestObj))),
    ?assert(proplists:get_value(requestId, Header) =:= ReqId),
    ?assert(Ttl =:= 1).

Replacement in test/cable_basic_SUITE.erl at line 26 [2.22]

B:BD[2.1133] → [2.1133:2186]

% whoami_test(Config) ->
%     Host = get_value(hostname, Config, "localhost"),
%     {ok, NewSbotClient} = ssb_client:start_link(Host, remote_long_pk()),
%     {WhoAmI} = jiffy:decode(ssb_client:send(NewSbotClient, whoami_req())),
%     ?assert(keys:pub_key_disp() == ?pgv(<<"id">>, WhoAmI)),
%     Config.
% remote_long_pk() ->
%     base64:decode(keys:pub_key()).
% ping() ->
%     Flags = rpc_processor:create_flags(1,0,2),
%     Body = jiffy:encode({[{<<"name">>,[<<"gossip">>,<<"ping">>]},
%                           {<<"args">>,[{[{<<"timeout">>, 300000}]}]},
%                           {<<"type">>,<<"duplex">>}]}),
%     Header = rpc_processor:create_header(Flags, size(Body), 1),
%     utils:combine(Header, Body).
% whoami_req() ->
%     Flags = rpc_processor:create_flags(1,0,2),
%     Body = jiffy:encode({[{<<"name">>,[?whoami]},
%                           {<<"args">>,[]},
%                           {<<"type">>,<<"async">>}]}),
%     Header = rpc_processor:create_header(Flags, size(Body), 1),
%     utils:combine(Header, Body).

[2.1133]

channel_time_range_request_test() ->
    [{binary, Bin}, {obj, TestObj}] = examples:channel_time_range_request(),
    Decoded = wire:decode_channel_time_range_request(Bin),
    [{header, Header}, {ttl, Ttl},
        {channel, Channel},
        {timestart, TimeStart},
        {timeend, TimeEnd},
        {limit, Limit}
    ] = Decoded,
    ?assert(proplists:get_value(msgLen, Header) =:= maps:get(<<"msgLen">>, TestObj)),
    ?assert(proplists:get_value(msgType, Header) =:= maps:get(<<"msgType">>, TestObj)),
    ReqId = hex:hexstr_to_bin(binary_to_list(maps:get(<<"reqid">>, TestObj))),
    ?assert(proplists:get_value(requestId, Header) =:= ReqId),
    ?assert(Channel =:= maps:get(<<"channel">>, TestObj)),
    ?assert(TimeStart =:= maps:get(<<"timeStart">>, TestObj)),
    ?assert(TimeEnd =:= maps:get(<<"timeEnd">>, TestObj)),
    ?assert(Limit =:= maps:get(<<"limit">>, TestObj)),
    ?assert(Ttl =:= 1).

File deletion: testrecs.erl

BF:BFD[2.5319] → [2.8427:8463]

BF:BFD[2.8463] → [2.6944:6944]

B:BD[2.6944] → [2.6945:8426]

-module(testrecs).
-export([test_hash_response/0]).
test_hash_response() ->
  D = <<"{\"name\":\"hashresponse\",\"type\":\"response\",\"id\":2,\"binary\":\"6b020000000095050429010320265674e8aac2dfddd78f86fe5a3dd68d976ca3f5ba23645ec7381480921d0d10705340e5528f2ef03a6797b72b1bb9f37f9009ad408247387c4bcc4d2a3371af700793dd51d4cb3c18a6df46f88bfe1665fba9b277487ddecd1e031441d69d\",\"obj\":{\"msgLen\":107,\"msgType\":2,\"reqid\":\"95050429\",\"ttl\":1,\"hashes\":[\"20265674e8aac2dfddd78f86fe5a3dd68d976ca3f5ba23645ec7381480921d0d\",\"10705340e5528f2ef03a6797b72b1bb9f37f9009ad408247387c4bcc4d2a3371\",\"af700793dd51d4cb3c18a6df46f88bfe1665fba9b277487ddecd1e031441d69d\"]}}">>,
  J = jsone:decode(D),
  #{ <<"binary">> := Bin, <<"obj">> := Obj } = J,
  [{binary, hex:hexstr_to_bin(binary_to_list(Bin))},
   {obj, Obj}].
% {
%   "name": "hash response",
%   "type": "response",
%   "id": 2,
%   "binary": "6b020000000095050429010320265674e8aac2dfddd78f86fe5a3dd68d976ca3f5ba23645ec7381480921d0d10705340e5528f2ef03a6797b72b1bb9f37f9009ad408247387c4bcc4d2a3371af700793dd51d4cb3c18a6df46f88bfe1665fba9b277487ddecd1e031441d69d",
%   "obj": {
%     "msgLen": 107,
%     "msgType": 2,
%     "reqid": "95050429",
%     "ttl": 1,
%     "hashes": [
%       "20265674e8aac2dfddd78f86fe5a3dd68d976ca3f5ba23645ec7381480921d0d",
%       "10705340e5528f2ef03a6797b72b1bb9f37f9009ad408247387c4bcc4d2a3371",
%       "af700793dd51d4cb3c18a6df46f88bfe1665fba9b277487ddecd1e031441d69d"
%     ]
%   }
% }

Replacement in apps/cable/src/wire.erl at line 3 [2.5336]

B:BD[2.5353] → [2.5353:5390]

-export([decode_response_header/1]).

[2.5353]

[2.5390]

-export([decode_hash_response/1, decode_cancel_request/1, decode_channel_time_range_request/1]).

Insertion in apps/cable/src/wire.erl at line 5 [2.5336]
[2.5391]
[2.5391]
```
% low-level
-export([decode_response_header/1]).
```

Insertion in apps/cable/src/wire.erl at line 21 [2.5336]

[2.5776]

decode_hash_response(Data) ->
    Header = decode_response_header(Data),
    Payload = proplists:get_value(payload, Header),
    {Ttl, Rest} = decode_varint(Payload),
    {HashCount, Rest2} = decode_varint(Rest),
    Hashes = [Hash || <<Hash:32/binary>> <= Rest2],
    case length(Hashes) =:= HashCount of
        false -> erlang:error("invalid hash_count");
        true -> [
            {header, proplists:delete(payload, Header)},
            {ttl, Ttl},
            {hashes, Hashes}
        ]
    end.
decode_cancel_request(Data) ->
    Header = decode_response_header(Data),
    Payload = proplists:get_value(payload, Header),
    {Ttl, <<CancelId:4/binary>>} = decode_varint(Payload),
    [   {header, proplists:delete(payload, Header)}
    ,   {ttl, Ttl}
    ,   {cancelid, CancelId}
    ].
decode_channel_time_range_request(Data) ->
    Header = decode_response_header(Data),
    Payload = proplists:get_value(payload, Header),
    {Ttl, Rest} = decode_varint(Payload),
    {ChannelLen, Rest2} = decode_varint(Rest),
    <<Channel:ChannelLen/binary, Rest3/binary>> = Rest2,
    {TimeStart, Rest4} = decode_varint(Rest3),
    {TimeEnd, Rest5} = decode_varint(Rest4),
    {Limit, <<>>} = decode_varint(Rest5),
    [ {header, proplists:delete(payload, Header)}
    , {ttl, Ttl}
    , {channel, Channel}
    , {timestart, TimeStart}
    , {timeend, TimeEnd}
    , {limit, Limit}
    ].