Merge pull request #542 from input-output-hk/to-chain-deps

move to chain-deps

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "cardano-deps"]
-	path = cardano-deps
-	url = https://github.com/input-output-hk/rust-cardano
+[submodule "chain-deps"]
+	path = chain-deps
+	url = https://github.com/input-output-hk/chain-libs

Cargo.toml

@@ -8,4 +8,6 @@ members = [
   "jormungandr-integration-tests",
 ]
 
-exclude = [ "cardano-deps" ]
+exclude = [
+    "chain-deps",
+]

jcli/Cargo.toml

@@ -44,17 +44,15 @@ native-tls = "0.2.2"
 regex = "1.1.2"
 bech32 = "0.6"
 hex             = { path = "../hex" }
-chain-core      = { path = "../cardano-deps/chain-core" }
-chain-impl-mockchain = { path = "../cardano-deps/chain-impl-mockchain" }
-chain-storage   = { path = "../cardano-deps/chain-storage" }
-chain-storage-sqlite = { path = "../cardano-deps/chain-storage-sqlite" }
-chain-addr      = { path = "../cardano-deps/chain-addr" }
-chain-crypto    = { path = "../cardano-deps/chain-crypto" }
-chain-time      = { path = "../cardano-deps/chain-time" }
-network-core    = { path = "../cardano-deps/network-core" }
-network-grpc    = { path = "../cardano-deps/network-grpc" }
-cardano         = { path = "../cardano-deps/cardano", features = [ "generic-serialization" ] }
-cardano-storage = { path = "../cardano-deps/storage" }
+chain-core      = { path = "../chain-deps/chain-core" }
+chain-impl-mockchain = { path = "../chain-deps/chain-impl-mockchain" }
+chain-storage   = { path = "../chain-deps/chain-storage" }
+chain-storage-sqlite = { path = "../chain-deps/chain-storage-sqlite" }
+chain-addr      = { path = "../chain-deps/chain-addr" }
+chain-crypto    = { path = "../chain-deps/chain-crypto" }
+chain-time      = { path = "../chain-deps/chain-time" }
+network-core    = { path = "../chain-deps/network-core" }
+network-grpc    = { path = "../chain-deps/network-grpc" }
 poldercast = { version = "0.3.1", features = [ "serde_derive" ] }
 reqwest = "0.9.11"
 custom_error = "1.6"

jcli/src/jcli_app/block/DOCUMENTED_EXAMPLE.yaml

@@ -66,7 +66,7 @@ initial:
   - cert: cert1qgqqqqqqqqqqqqqqqqqqq0p5avfqqmgurpe7s9k7933q0wj420jl5xqvx8lywcu5jcr7fwqa9qmdn93q4nm7c4fsay3mzeqgq3c0slnut9kns08yn2qn80famup7nvgtfuyszqzqrd4lxlt5ylplfu76p8f6ks0ggprzatp2c8rn6ev3hn9dgr38tzful4h0udlwa0536vyrrug7af9ujmrr869afs0yw9gj5x7z24l8sps3zzcmv
 
   # Initial deposits present in the blockchain
-  - legacy_fund:
-      # Legacy Cardano address
-      address: 48mDfYyQn21iyEPzCfkATEHTwZBcZJqXhRJezmswfvc6Ne89u1axXsiazmgd7SwT8VbafbVnCvyXhBSMhSkPiCezMkqHC4dmxRahRC86SknFu6JF6hwSg8
-      value: 123
+  # - legacy_fund:
+  #     # Legacy Cardano address
+  #     address: 48mDfYyQn21iyEPzCfkATEHTwZBcZJqXhRJezmswfvc6Ne89u1axXsiazmgd7SwT8VbafbVnCvyXhBSMhSkPiCezMkqHC4dmxRahRC86SknFu6JF6hwSg8
+  #     value: 123

jcli/src/jcli_app/block/yaml.rs

@@ -89,7 +89,7 @@ struct InitialUTxO {
 #[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 struct LegacyUTxO {
-    pub address: OldAddress,
+    //pub address: OldAddress,
     #[serde(with = "serde::value")]
     pub value: Value,
 }
@@ -319,8 +319,8 @@ fn extend_inits_with_legacy_utxo(initials: &mut Vec<Initial>, utxo_decl: &UtxoDe
     let inits_iter = utxo_decl
         .addrs
         .iter()
-        .map(|(address, value)| LegacyUTxO {
-            address: address.clone(),
+        .map(|(_address, value)| LegacyUTxO {
+            //address: address.clone(),
             value: value.clone(),
         })
         .map(Initial::LegacyFund);
@@ -369,7 +369,7 @@ impl<'a> From<&'a InitialCertificate> for Message {
 impl<'a> From<&'a LegacyUTxO> for Message {
     fn from(utxo: &'a LegacyUTxO) -> Message {
         Message::OldUtxoDeclaration(UtxoDeclaration {
-            addrs: vec![(utxo.address.clone(), utxo.value)],
+            addrs: vec![], // vec![(utxo.address.clone(), utxo.value)],
         })
     }
 }
@@ -440,15 +440,9 @@ blockchain_configuration:
   kes_update_speed: 43200
 initial:
   - cert: cert1qgqqqqqqqqqqqqqqqqqqq0p5avfqqmgurpe7s9k7933q0wj420jl5xqvx8lywcu5jcr7fwqa9qmdn93q4nm7c4fsay3mzeqgq3c0slnut9kns08yn2qn80famup7nvgtfuyszqzqrd4lxlt5ylplfu76p8f6ks0ggprzatp2c8rn6ev3hn9dgr38tzful4h0udlwa0536vyrrug7af9ujmrr869afs0yw9gj5x7z24l8sps3zzcmv
-  - legacy_fund:
-      address: 48mDfYyQn21iyEPzCfkATEHTwZBcZJqXhRJezmswfvc6Ne89u1axXsiazmgd7SwT8VbafbVnCvyXhBSMhSkPiCezMkqHC4dmxRahRC86SknFu6JF6hwSg8
-      value: 123
   - fund:
       address: {}
-      value: 10000
-  - legacy_fund:
-      address: 48mDfYyQn21iyEPzCfkATEHTwZBcZJqXhRJezmswfvc6Ne89u1axXsiazmgd7SwT8VbafbVnCvyXhBSMhSkPiCezMkqHC4dmxRahRC86SknFu6JF6hwSg8
-      value: 456"#, leader_1_pk, leader_2_pk, initial_funds_address);
+      value: 10000"#, leader_1_pk, leader_2_pk, initial_funds_address);
         let genesis: Genesis =
             serde_yaml::from_str(genesis_yaml.as_str()).expect("Failed to deserialize YAML");
 

jcli/src/main.rs

@@ -1,5 +1,4 @@
 extern crate bech32;
-extern crate cardano;
 extern crate chain_addr;
 extern crate chain_core;
 extern crate chain_crypto;

jormungandr-integration-tests/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Nicolas Di Prima <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-chain-crypto    = { path = "../cardano-deps/chain-crypto" }
-chain-addr      = { path = "../cardano-deps/chain-addr" }
+chain-crypto    = { path = "../chain-deps/chain-crypto" }
+chain-addr      = { path = "../chain-deps/chain-addr" }
 jormungandr-lib = { path = "../jormungandr-lib" }
 rand = "0.6"
 rand_chacha = "0.1"
@@ -28,4 +28,4 @@ jormungandr = { path = "../jormungandr" }
 jcli = { path = "../jcli" }
 
 [features]
-soak-test = []
+soak-test = []

jormungandr-integration-tests/src/common/configuration/genesis_model.rs

@@ -123,7 +123,7 @@ impl GenesisYaml {
         let leader_1_pk = leader_1.public_key().to_bech32_str();
         let leader_2_pk = leader_2.public_key().to_bech32_str();
         let funds = initial_funds.into_iter().flatten().map(Initial::Fund);
-        let legacy = legacy_funds.into_iter().flatten().map(Initial::LegacyFund);
+        let legacy = vec![]; // legacy_funds.into_iter().flatten().map(Initial::LegacyFund);
         GenesisYaml {
             blockchain_configuration: BlockchainConfig {
                 block0_date: Some(1554185140),

jormungandr-lib/Cargo.toml

@@ -8,16 +8,16 @@ edition = "2018"
 bech32 = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 custom_error = "1.6"
-chain-impl-mockchain = { path = "../cardano-deps/chain-impl-mockchain" }
-chain-addr      = { path = "../cardano-deps/chain-addr" }
-chain-crypto    = { path = "../cardano-deps/chain-crypto" }
+chain-impl-mockchain = { path = "../chain-deps/chain-impl-mockchain" }
+chain-addr      = { path = "../chain-deps/chain-addr" }
+chain-crypto    = { path = "../chain-deps/chain-crypto" }
 rand_core = "0.3"
 chrono = { version = "0.4", features = ["serde"] }
 humantime = "1.2"
 
 [dev-dependencies]
 rand = "0.6"
 quickcheck = "0.8"
-chain-crypto    = { path = "../cardano-deps/chain-crypto", features = [ "property-test-api" ] }
+chain-crypto    = { path = "../chain-deps/chain-crypto", features = [ "property-test-api" ] }
 serde_yaml = "0.8"
 bincode = "1.1"

jormungandr-utils/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2018"
 
 [dependencies]
 bech32 = "0.6"
-chain-core      = { path = "../cardano-deps/chain-core" }
-chain-addr      = { path = "../cardano-deps/chain-addr" }
-chain-crypto    = { path = "../cardano-deps/chain-crypto" }
-chain-impl-mockchain = { path = "../cardano-deps/chain-impl-mockchain" }
+chain-core      = { path = "../chain-deps/chain-core" }
+chain-addr      = { path = "../chain-deps/chain-addr" }
+chain-crypto    = { path = "../chain-deps/chain-crypto" }
+chain-impl-mockchain = { path = "../chain-deps/chain-impl-mockchain" }
 humantime = "1.2"
 serde = "1.0"
 custom_error = "1.6"

jormungandr/Cargo.toml

@@ -45,17 +45,15 @@ native-tls = "0.2.2"
 regex = "1.1.2"
 bech32 = "0.6"
 hex             = { path = "../hex" }
-chain-core      = { path = "../cardano-deps/chain-core" }
-chain-impl-mockchain = { path = "../cardano-deps/chain-impl-mockchain" }
-chain-storage   = { path = "../cardano-deps/chain-storage" }
-chain-storage-sqlite = { path = "../cardano-deps/chain-storage-sqlite" }
-chain-addr      = { path = "../cardano-deps/chain-addr" }
-chain-crypto    = { path = "../cardano-deps/chain-crypto" }
-chain-time      = { path = "../cardano-deps/chain-time" }
-network-core    = { path = "../cardano-deps/network-core" }
-network-grpc    = { path = "../cardano-deps/network-grpc" }
-cardano         = { path = "../cardano-deps/cardano", features = [ "generic-serialization" ] }
-cardano-storage = { path = "../cardano-deps/storage" }
+chain-core      = { path = "../chain-deps/chain-core" }
+chain-impl-mockchain = { path = "../chain-deps/chain-impl-mockchain" }
+chain-storage   = { path = "../chain-deps/chain-storage" }
+chain-storage-sqlite = { path = "../chain-deps/chain-storage-sqlite" }
+chain-addr      = { path = "../chain-deps/chain-addr" }
+chain-crypto    = { path = "../chain-deps/chain-crypto" }
+chain-time      = { path = "../chain-deps/chain-time" }
+network-core    = { path = "../chain-deps/network-core" }
+network-grpc    = { path = "../chain-deps/network-grpc" }
 poldercast = { version = "0.3.1", features = [ "serde_derive" ] }
 reqwest = "0.9.11"
 custom_error = "1.6"

jormungandr/src/main.rs

@@ -5,8 +5,6 @@ extern crate actix_web;
 extern crate bech32;
 extern crate bincode;
 extern crate bytes;
-extern crate cardano;
-extern crate cardano_storage;
 extern crate cbor_event;
 extern crate chain_addr;
 extern crate chain_core;

jormungandr/src/network/mod.rs

@@ -7,8 +7,6 @@
 
 mod client;
 mod grpc;
-// TODO: to be ported
-//mod ntt;
 pub mod p2p;
 mod service;
 mod subscription;