From beb8cff182ca26f14f816ea7245d93b498422d21 Mon Sep 17 00:00:00 2001 From: librelois <elois@ifee.fr> Date: Fri, 2 Nov 2018 00:48:17 +0100 Subject: [PATCH] [ref] wip: prepare dup crates publication --- Cargo.lock | 70 +++++++++++++++++++++++++++++------- blockchain/Cargo.toml | 2 +- conf/Cargo.toml | 2 +- core/Cargo.toml | 2 +- crypto/Cargo.toml | 4 ++- dal/Cargo.toml | 2 +- documents/Cargo.toml | 2 +- message/Cargo.toml | 2 +- module/Cargo.toml | 2 +- network-documents/Cargo.toml | 2 +- network/Cargo.toml | 2 +- tui/Cargo.toml | 2 +- ws2p-messages/Cargo.toml | 2 +- ws2p-v1-legacy/Cargo.toml | 2 +- ws2p/Cargo.toml | 4 +-- 15 files changed, 74 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3760ea30..6486e776 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,6 +55,14 @@ name = "base58" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "base64" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "base64" version = "0.9.2" @@ -230,7 +238,7 @@ dependencies = [ "duniter-message 0.1.0-a0.1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "durs-wot 0.8.0-a0.9", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -250,7 +258,7 @@ dependencies = [ "dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "duniter-documents 0.9.0-b1", "duniter-module 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -267,7 +275,7 @@ dependencies = [ "duniter-message 0.1.0-a0.1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "log-panics 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", @@ -285,7 +293,7 @@ dependencies = [ "duniter-documents 0.9.0-b1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-wot 0.8.0-a0.9", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -302,7 +310,7 @@ dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", @@ -318,7 +326,7 @@ dependencies = [ "duniter-documents 0.9.0-b1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -329,7 +337,7 @@ name = "duniter-module" version = "0.1.0-a0.1" dependencies = [ "duniter-documents 0.9.0-b1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)", @@ -342,7 +350,7 @@ version = "0.1.0-a0.1" dependencies = [ "duniter-documents 0.9.0-b1", "duniter-module 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -359,7 +367,7 @@ dependencies = [ "duniter-message 0.1.0-a0.1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", @@ -372,6 +380,20 @@ dependencies = [ [[package]] name = "dup-crypto" version = "0.3.0-b2" +dependencies = [ + "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rust-crypto-wasm 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.78 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dup-crypto" +version = "0.3.0-b2" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -400,7 +422,7 @@ dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "duniter-documents 0.9.0-b1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -428,7 +450,7 @@ dependencies = [ "duniter-message 0.1.0-a0.1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "durs-ws2p-messages 0.1.0-a0.1", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -444,7 +466,7 @@ dependencies = [ "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "duniter-documents 0.9.0-b1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -465,7 +487,7 @@ dependencies = [ "duniter-message 0.1.0-a0.1", "duniter-module 0.1.0-a0.1", "duniter-network 0.1.0-a0.1", - "dup-crypto 0.3.0-b2", + "dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)", "durs-network-documents 0.1.0-a0.1", "durs-wot 0.8.0-a0.9", "log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -548,6 +570,11 @@ dependencies = [ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "httparse" version = "1.3.0" @@ -913,6 +940,19 @@ dependencies = [ "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rust-crypto-wasm" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", + "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustbreak" version = "2.0.0-rc2" @@ -1262,6 +1302,7 @@ dependencies = [ "checksum backtrace-sys 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "bff67d0c06556c0b8e6b5f090f0eac52d950d9dfd1d35ba04e4ca3543eaf6a7e" "checksum base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" "checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2" +"checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557" "checksum base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "85415d2594767338a74a30c1d370b2f3262ec1b4ed2d7bba5b3faf4de40467d9" "checksum bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2fb9e29e72fd6bc12071533d5dc7664cb01480c59406f656d7ac25c7bd8ff7" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" @@ -1282,6 +1323,7 @@ dependencies = [ "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" "checksum dirs 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "37a76dd8b997af7107d0bb69d43903cf37153a18266f8b3fdb9911f28efb5444" "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" +"checksum dup-crypto 0.3.0-b2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2c99de4ca024e4c3339674708b40e053dce53d86be68c5ec7bcc3a25804a4b1" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "934799b6c1de475a012a02dab0ace1ace43789ee4b99bcfbf1a2e3e8ced5de82" "checksum failure_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7cdda555bb90c9bb67a3b670a0f42de8e73f5981524123ad8578aafec8ddb8b" @@ -1292,6 +1334,7 @@ dependencies = [ "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" +"checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" "checksum httparse 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "422d5a93b40dbfbd8c8c24d1b4b5ef455973ef3afffc172487429fecd05bde42" "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" @@ -1336,6 +1379,7 @@ dependencies = [ "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" +"checksum rust-crypto-wasm 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9dcf11edbc9a0effb4a99ddbe909dd26fb2e71459064879218c27b0add1cb6ec" "checksum rustbreak 2.0.0-rc2 (registry+https://github.com/rust-lang/crates.io-index)" = "676cb04876f4391d5d2f2c9029d10cfe5fe28ad625ad8460531bed1191477083" "checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" diff --git a/blockchain/Cargo.toml b/blockchain/Cargo.toml index 218ff6b2..9bd0eca3 100644 --- a/blockchain/Cargo.toml +++ b/blockchain/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] dirs = "1.0.2" duniter-conf = { path = "../conf" } -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-dal = { path = "../dal" } duniter-documents = { path = "../documents" } durs-network-documents = { path = "../network-documents" } diff --git a/conf/Cargo.toml b/conf/Cargo.toml index 24a426c9..c01cfd5c 100644 --- a/conf/Cargo.toml +++ b/conf/Cargo.toml @@ -14,7 +14,7 @@ serde = "1.0.*" serde_derive = "1.0.*" serde_json = "1.0.*" dirs = "1.0.2" -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } duniter-module = { path = "../module" } diff --git a/core/Cargo.toml b/core/Cargo.toml index fe81eec1..c595c83a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -12,7 +12,7 @@ path = "lib.rs" dirs = "1.0.2" duniter-blockchain = { path = "../blockchain" } duniter-conf = { path = "../conf" } -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-message = { path = "../message" } duniter-module = { path = "../module" } duniter-network = { path = "../network" } diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index 9927beb5..35767cc7 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -16,10 +16,12 @@ base58 = "0.1.*" base64 = "0.10.*" bincode = "1.0.*" rand = "0.5.*" -rust-crypto = "0.2.*" +rust-crypto-wasm = "0.3.1" serde = "1.0.*" serde_derive = "1.0.*" + + [features] # Treat warnings as a build error. strict = [] \ No newline at end of file diff --git a/dal/Cargo.toml b/dal/Cargo.toml index dd16c4e6..ac0d5d01 100644 --- a/dal/Cargo.toml +++ b/dal/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0" path = "lib.rs" [dependencies] -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } duniter-module = { path = "../module" } duniter-network = { path = "../network" } diff --git a/documents/Cargo.toml b/documents/Cargo.toml index 8b887f77..58e2ab7c 100644 --- a/documents/Cargo.toml +++ b/documents/Cargo.toml @@ -15,7 +15,7 @@ path = "src/lib.rs" base58 = "0.1.*" base64 = "0.9.*" byteorder = "1.2.3" -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" pest = "2.0" pest_derive = "2.0" rust-crypto = "0.2.*" diff --git a/message/Cargo.toml b/message/Cargo.toml index c6ec17a1..53452745 100644 --- a/message/Cargo.toml +++ b/message/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0" path = "lib.rs" [dependencies] -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-dal = { path = "../dal" } duniter-documents = { path = "../documents" } duniter-module = { path = "../module" } diff --git a/module/Cargo.toml b/module/Cargo.toml index 97a06dd0..16978872 100644 --- a/module/Cargo.toml +++ b/module/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0" path = "lib.rs" [dependencies] -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } serde = "1.0.*" serde_derive = "1.0.*" diff --git a/network-documents/Cargo.toml b/network-documents/Cargo.toml index be4f4523..145a566a 100644 --- a/network-documents/Cargo.toml +++ b/network-documents/Cargo.toml @@ -10,7 +10,7 @@ path = "src/lib.rs" [dependencies] base58 = "0.1.*" -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } pest = "2.0" pest_derive = "2.0" diff --git a/network/Cargo.toml b/network/Cargo.toml index 42358ae4..03be0a2b 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0" path = "lib.rs" [dependencies] -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } duniter-module = { path = "../module" } durs-network-documents = { path = "../network-documents" } diff --git a/tui/Cargo.toml b/tui/Cargo.toml index f069ff32..a228fd36 100644 --- a/tui/Cargo.toml +++ b/tui/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" [dependencies] duniter-conf = { path = "../conf" } -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-dal = { path = "../dal" } duniter-documents = { path = "../documents" } duniter-message = { path = "../message" } diff --git a/ws2p-messages/Cargo.toml b/ws2p-messages/Cargo.toml index fa0e7d6a..8356a18c 100644 --- a/ws2p-messages/Cargo.toml +++ b/ws2p-messages/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] bincode = "1.0.*" byteorder = "1.2.3" -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-documents = { path = "../documents" } durs-network-documents = { path = "../network-documents" } log = "0.4.*" diff --git a/ws2p-v1-legacy/Cargo.toml b/ws2p-v1-legacy/Cargo.toml index 0350c5e7..5b3221b7 100644 --- a/ws2p-v1-legacy/Cargo.toml +++ b/ws2p-v1-legacy/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" [dependencies] byteorder = "1.2.3" duniter-conf = { path = "../conf" } -dup-crypto = { path = "../crypto" } +dup-crypto = "0.3.0-b2" duniter-dal = { path = "../dal" } duniter-documents = { path = "../documents" } durs-network-documents = { path = "../network-documents" } diff --git a/ws2p/Cargo.toml b/ws2p/Cargo.toml index dbd5d5b9..d2d83af9 100644 --- a/ws2p/Cargo.toml +++ b/ws2p/Cargo.toml @@ -9,8 +9,8 @@ license = "AGPL-3.0" path = "lib.rs" [dependencies] -duniter-conf = { path = "../conf" } -dup-crypto = { path = "../crypto" } +duniter-conf= { path = "../conf" } +dup-crypto = "0.3.0-b2" durs-network-documents = { path = "../network-documents" } durs-ws2p-messages = { path = "../ws2p-messages" } duniter-message= { path = "../message" } -- GitLab