balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bc37fde73e : Restore compatibily with (old) identity.json that does not contain a peer_id

Browse Source
This commit is contained in:
Pierre Boutillier 2018-10-10 00:14:15 +02:00 committed by Grégoire Henry
parent 255d9e4ff7
commit 1e5c6da307
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib_base/p2p_identity.ml
View File

@ -34,11 +34,15 @@ let encoding =
let open Data_encoding in let open Data_encoding in
conv conv
(fun { peer_id ; public_key ; secret_key ; proof_of_work_stamp } -> (fun { peer_id ; public_key ; secret_key ; proof_of_work_stamp } ->
(peer_id, public_key, secret_key, proof_of_work_stamp)) (Some peer_id, public_key, secret_key, proof_of_work_stamp))
(fun (peer_id, public_key, secret_key, proof_of_work_stamp) -> (fun (peer_id_opt, public_key, secret_key, proof_of_work_stamp) ->
let peer_id =
match peer_id_opt with
| Some peer_id -> peer_id
| None -> Tezos_crypto.Crypto_box.hash public_key in
{ peer_id ; public_key ; secret_key ; proof_of_work_stamp }) { peer_id ; public_key ; secret_key ; proof_of_work_stamp })
(obj4 (obj4
(req "peer_id" P2p_peer_id.encoding) (opt "peer_id" P2p_peer_id.encoding)
(req "public_key" Crypto_box.public_key_encoding) (req "public_key" Crypto_box.public_key_encoding)
(req "secret_key" Crypto_box.secret_key_encoding) (req "secret_key" Crypto_box.secret_key_encoding)
(req "proof_of_work_stamp" Crypto_box.nonce_encoding)) (req "proof_of_work_stamp" Crypto_box.nonce_encoding))