Update check_polkadot_companion_build #9721

joao-paulo-parity · 2021-09-07T15:13:37Z

closes #9719

This PR likely will land before #9010 or #9749. The work for those branches should incorporate this PR's code.

.gitlab-ci.yml

…enamed crates and simplify it a bit

deletion will be reverted later

This reverts commit 0c258de.

joao-paulo-parity · 2021-09-07T23:26:39Z

The deletion check is working: https://gitlab.parity.io/parity/substrate/-/jobs/1104433#L2093

Failed to detect our crate "sc-utils" referenced in polkadot

Because it was renamed in 0c258de. Following is the patch for triggering the failure:

Patch

From 0c258de4e5ab271c16414d1ad8f188f9e9be84c6 Mon Sep 17 00:00:00 2001
From: joao-paulo-parity <joao-paulo@parity.io>
Date: Tue, 7 Sep 2021 14:23:41 -0300
Subject: [PATCH] sc_utils => sc_foo (for testing's sake)

---
 Cargo.lock                                    | 40 +++++++++----------
 client/api/Cargo.toml                         |  2 +-
 client/api/src/client.rs                      |  2 +-
 client/api/src/notifications.rs               |  2 +-
 client/cli/Cargo.toml                         |  2 +-
 client/cli/src/runner.rs                      |  2 +-
 client/consensus/common/Cargo.toml            |  2 +-
 .../common/src/import_queue/basic_queue.rs    |  2 +-
 .../common/src/import_queue/buffered_link.rs  |  2 +-
 client/finality-grandpa/Cargo.toml            |  2 +-
 .../src/communication/gossip.rs               |  2 +-
 .../finality-grandpa/src/communication/mod.rs |  2 +-
 .../src/communication/periodic.rs             |  2 +-
 .../src/communication/tests.rs                |  2 +-
 client/finality-grandpa/src/import.rs         |  2 +-
 client/finality-grandpa/src/lib.rs            |  2 +-
 client/finality-grandpa/src/notification.rs   |  2 +-
 client/finality-grandpa/src/observer.rs       |  4 +-
 client/finality-grandpa/src/until_imported.rs |  4 +-
 client/network/Cargo.toml                     |  2 +-
 client/network/src/on_demand_layer.rs         |  2 +-
 client/network/src/service.rs                 |  2 +-
 client/offchain/Cargo.toml                    |  2 +-
 client/offchain/src/api/http.rs               |  2 +-
 client/peerset/Cargo.toml                     |  2 +-
 client/peerset/src/lib.rs                     |  2 +-
 client/rpc/Cargo.toml                         |  2 +-
 client/rpc/src/system/mod.rs                  |  2 +-
 client/rpc/src/system/tests.rs                |  2 +-
 client/service/Cargo.toml                     |  2 +-
 client/service/src/builder.rs                 |  2 +-
 client/service/src/client/client.rs           |  2 +-
 client/service/src/lib.rs                     |  2 +-
 client/service/src/metrics.rs                 |  2 +-
 client/service/src/task_manager/mod.rs        |  2 +-
 client/transaction-pool/Cargo.toml            |  2 +-
 client/transaction-pool/graph/Cargo.toml      |  2 +-
 client/transaction-pool/src/graph/watcher.rs  |  2 +-
 client/transaction-pool/src/revalidation.rs   |  2 +-
 client/utils/Cargo.toml                       |  2 +-
 40 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5205f0dd..9c2ac8903 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7307,12 +7307,12 @@ dependencies = [
  "regex",
  "rpassword",
  "sc-client-api",
+ "sc-foo",
  "sc-keystore",
  "sc-network",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
- "sc-utils",
  "serde",
  "serde_json",
  "sp-blockchain",
@@ -7340,8 +7340,8 @@ dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
  "sc-executor",
+ "sc-foo",
  "sc-transaction-pool-api",
- "sc-utils",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -7398,7 +7398,7 @@ dependencies = [
  "log 0.4.14",
  "parking_lot 0.11.1",
  "sc-client-api",
- "sc-utils",
+ "sc-foo",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -7747,12 +7747,12 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
+ "sc-foo",
  "sc-keystore",
  "sc-network",
  "sc-network-gossip",
  "sc-network-test",
  "sc-telemetry",
- "sc-utils",
  "serde_json",
  "sp-api",
  "sp-application-crypto",
@@ -7798,6 +7798,16 @@ dependencies = [
  "substrate-test-runtime-client",
 ]
 
+[[package]]
+name = "sc-foo"
+version = "4.0.0-dev"
+dependencies = [
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "lazy_static",
+ "prometheus",
+]
+
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
@@ -7880,8 +7890,8 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-consensus",
+ "sc-foo",
  "sc-peerset",
- "sc-utils",
  "serde",
  "serde_json",
  "smallvec 1.6.1",
@@ -7968,10 +7978,10 @@ dependencies = [
  "sc-block-builder",
  "sc-client-api",
  "sc-client-db",
+ "sc-foo",
  "sc-network",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sc-utils",
  "sp-api",
  "sp-consensus",
  "sp-core",
@@ -7991,7 +8001,7 @@ dependencies = [
  "libp2p",
  "log 0.4.14",
  "rand 0.7.3",
- "sc-utils",
+ "sc-foo",
  "serde_json",
  "wasm-timer",
 ]
@@ -8020,12 +8030,12 @@ dependencies = [
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-foo",
  "sc-network",
  "sc-rpc-api",
  "sc-tracing",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sc-utils",
  "serde_json",
  "sp-api",
  "sp-blockchain",
@@ -8118,6 +8128,7 @@ dependencies = [
  "sc-client-db",
  "sc-consensus",
  "sc-executor",
+ "sc-foo",
  "sc-informant",
  "sc-keystore",
  "sc-light",
@@ -8129,7 +8140,6 @@ dependencies = [
  "sc-tracing",
  "sc-transaction-pool",
  "sc-transaction-pool-api",
- "sc-utils",
  "serde",
  "serde_json",
  "sp-api",
@@ -8302,8 +8312,8 @@ dependencies = [
  "retain_mut",
  "sc-block-builder",
  "sc-client-api",
+ "sc-foo",
  "sc-transaction-pool-api",
- "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -8332,16 +8342,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "sc-utils"
-version = "4.0.0-dev"
-dependencies = [
- "futures 0.3.16",
- "futures-timer 3.0.2",
- "lazy_static",
- "prometheus",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.19"
diff --git a/client/api/Cargo.toml b/client/api/Cargo.toml
index 772f22e82..d820b62a6 100644
--- a/client/api/Cargo.toml
+++ b/client/api/Cargo.toml
@@ -30,7 +30,7 @@ sp-database = { version = "4.0.0-dev", path = "../../primitives/database" }
 sp-core = { version = "4.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-runtime = { version = "4.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../primitives/state-machine" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
diff --git a/client/api/src/client.rs b/client/api/src/client.rs
index 21f8aecad..9b64800e3 100644
--- a/client/api/src/client.rs
+++ b/client/api/src/client.rs
@@ -29,7 +29,7 @@ use std::{collections::HashSet, convert::TryFrom, fmt, sync::Arc};
 
 use crate::{blockchain::Info, notifications::StorageEventStream};
 use sc_transaction_pool_api::ChainEvent;
-use sc_utils::mpsc::TracingUnboundedReceiver;
+use sc_foo::mpsc::TracingUnboundedReceiver;
 use sp_blockchain;
 
 /// Type that implements `futures::Stream` of block import events.
diff --git a/client/api/src/notifications.rs b/client/api/src/notifications.rs
index 1346afd5e..3a366c1e1 100644
--- a/client/api/src/notifications.rs
+++ b/client/api/src/notifications.rs
@@ -25,7 +25,7 @@ use std::{
 
 use fnv::{FnvHashMap, FnvHashSet};
 use prometheus_endpoint::{register, CounterVec, Opts, Registry, U64};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::storage::{StorageData, StorageKey};
 use sp_runtime::traits::Block as BlockT;
 
diff --git a/client/cli/Cargo.toml b/client/cli/Cargo.toml
index 7798507e5..b00a89d31 100644
--- a/client/cli/Cargo.toml
+++ b/client/cli/Cargo.toml
@@ -30,7 +30,7 @@ sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sc-network = { version = "0.10.0-dev", path = "../network" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
index 2ec200d92..972bd9853 100644
--- a/client/cli/src/runner.rs
+++ b/client/cli/src/runner.rs
@@ -21,7 +21,7 @@ use chrono::prelude::*;
 use futures::{future, future::FutureExt, pin_mut, select, Future};
 use log::info;
 use sc_service::{Configuration, Error as ServiceError, TaskManager, TaskType};
-use sc_utils::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
+use sc_foo::metrics::{TOKIO_THREADS_ALIVE, TOKIO_THREADS_TOTAL};
 use std::marker::PhantomData;
 
 #[cfg(target_family = "unix")]
diff --git a/client/consensus/common/Cargo.toml b/client/consensus/common/Cargo.toml
index 6829bd2c6..ad81f168d 100644
--- a/client/consensus/common/Cargo.toml
+++ b/client/consensus/common/Cargo.toml
@@ -24,7 +24,7 @@ sp-core = { path = "../../../primitives/core", version = "4.0.0-dev" }
 sp-consensus = { path = "../../../primitives/consensus/common", version = "0.10.0-dev" }
 sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../../utils" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 parking_lot = "0.11.1"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/client/consensus/common/src/import_queue/basic_queue.rs b/client/consensus/common/src/import_queue/basic_queue.rs
index 9042c8798..7e76a7fdb 100644
--- a/client/consensus/common/src/import_queue/basic_queue.rs
+++ b/client/consensus/common/src/import_queue/basic_queue.rs
@@ -22,7 +22,7 @@ use futures::{
 use futures_timer::Delay;
 use log::{debug, trace};
 use prometheus_endpoint::Registry;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_consensus::BlockOrigin;
 use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT, NumberFor},
diff --git a/client/consensus/common/src/import_queue/buffered_link.rs b/client/consensus/common/src/import_queue/buffered_link.rs
index 87ea6dde5..3960718d6 100644
--- a/client/consensus/common/src/import_queue/buffered_link.rs
+++ b/client/consensus/common/src/import_queue/buffered_link.rs
@@ -40,7 +40,7 @@
 
 use crate::import_queue::{Link, Origin};
 use futures::prelude::*;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use std::{
 	pin::Pin,
diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
index 40385a2fa..e0ed612c9 100644
--- a/client/finality-grandpa/Cargo.toml
+++ b/client/finality-grandpa/Cargo.toml
@@ -27,7 +27,7 @@ parity-scale-codec = { version = "2.0.0", features = ["derive"] }
 sp-application-crypto = { version = "4.0.0-dev", path = "../../primitives/application-crypto" }
 sp-arithmetic = { version = "4.0.0-dev", path = "../../primitives/arithmetic" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/finality-grandpa/src/communication/gossip.rs b/client/finality-grandpa/src/communication/gossip.rs
index d64c7421a..964f3fb36 100644
--- a/client/finality-grandpa/src/communication/gossip.rs
+++ b/client/finality-grandpa/src/communication/gossip.rs
@@ -94,7 +94,7 @@ use log::{debug, trace};
 use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
 use rand::seq::SliceRandom;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 use super::{benefit, cost, Round, SetId};
 use crate::{environment, CatchUp, CompactCommit, SignedMessage};
diff --git a/client/finality-grandpa/src/communication/mod.rs b/client/finality-grandpa/src/communication/mod.rs
index c370e1d64..280340236 100644
--- a/client/finality-grandpa/src/communication/mod.rs
+++ b/client/finality-grandpa/src/communication/mod.rs
@@ -58,7 +58,7 @@ use crate::{
 use gossip::{
 	FullCatchUpMessage, FullCommitMessage, GossipMessage, GossipValidator, PeerReport, VoteMessage,
 };
-use sc_utils::mpsc::TracingUnboundedReceiver;
+use sc_foo::mpsc::TracingUnboundedReceiver;
 use sp_finality_grandpa::{AuthorityId, AuthoritySignature, RoundNumber, SetId as SetIdNumber};
 
 pub mod gossip;
diff --git a/client/finality-grandpa/src/communication/periodic.rs b/client/finality-grandpa/src/communication/periodic.rs
index 77e55ad65..a09cfab6b 100644
--- a/client/finality-grandpa/src/communication/periodic.rs
+++ b/client/finality-grandpa/src/communication/periodic.rs
@@ -21,7 +21,7 @@
 use futures::{future::FutureExt as _, prelude::*, ready, stream::Stream};
 use futures_timer::Delay;
 use log::debug;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{
 	pin::Pin,
 	task::{Context, Poll},
diff --git a/client/finality-grandpa/src/communication/tests.rs b/client/finality-grandpa/src/communication/tests.rs
index 1fac0230b..509ffd4ed 100644
--- a/client/finality-grandpa/src/communication/tests.rs
+++ b/client/finality-grandpa/src/communication/tests.rs
@@ -28,7 +28,7 @@ use parity_scale_codec::Encode;
 use sc_network::{config::Role, Event as NetworkEvent, ObservedRole, PeerId};
 use sc_network_gossip::Validator;
 use sc_network_test::{Block, Hash};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_finality_grandpa::AuthorityList;
 use sp_keyring::Ed25519Keyring;
 use sp_runtime::traits::NumberFor;
diff --git a/client/finality-grandpa/src/import.rs b/client/finality-grandpa/src/import.rs
index f663bfe94..2ee0b4ec2 100644
--- a/client/finality-grandpa/src/import.rs
+++ b/client/finality-grandpa/src/import.rs
@@ -27,7 +27,7 @@ use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ImportResult, JustificationImport,
 };
 use sc_telemetry::TelemetryHandle;
-use sc_utils::mpsc::TracingUnboundedSender;
+use sc_foo::mpsc::TracingUnboundedSender;
 use sp_api::{Core, RuntimeApiInfo, TransactionFor};
 use sp_blockchain::{well_known_cache_keys, BlockStatus};
 use sp_consensus::{BlockOrigin, Error as ConsensusError, SelectChain};
diff --git a/client/finality-grandpa/src/lib.rs b/client/finality-grandpa/src/lib.rs
index 452659ced..6ce476ef5 100644
--- a/client/finality-grandpa/src/lib.rs
+++ b/client/finality-grandpa/src/lib.rs
@@ -68,7 +68,7 @@ use sc_client_api::{
 };
 use sc_consensus::BlockImport;
 use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver};
 use sp_api::ProvideRuntimeApi;
 use sp_application_crypto::AppKey;
 use sp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
diff --git a/client/finality-grandpa/src/notification.rs b/client/finality-grandpa/src/notification.rs
index 85d581bd5..b1b28d4f1 100644
--- a/client/finality-grandpa/src/notification.rs
+++ b/client/finality-grandpa/src/notification.rs
@@ -19,7 +19,7 @@
 use parking_lot::Mutex;
 use std::sync::Arc;
 
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::Block as BlockT;
 
 use crate::{justification::GrandpaJustification, Error};
diff --git a/client/finality-grandpa/src/observer.rs b/client/finality-grandpa/src/observer.rs
index 70a94cd50..7319a44ad 100644
--- a/client/finality-grandpa/src/observer.rs
+++ b/client/finality-grandpa/src/observer.rs
@@ -29,7 +29,7 @@ use log::{debug, info, warn};
 
 use sc_client_api::backend::Backend;
 use sc_telemetry::TelemetryHandle;
-use sc_utils::mpsc::TracingUnboundedReceiver;
+use sc_foo::mpsc::TracingUnboundedReceiver;
 use sp_blockchain::HeaderMetadata;
 use sp_consensus::SelectChain;
 use sp_finality_grandpa::AuthorityId;
@@ -403,7 +403,7 @@ mod tests {
 	};
 	use assert_matches::assert_matches;
 	use sc_network::PeerId;
-	use sc_utils::mpsc::tracing_unbounded;
+	use sc_foo::mpsc::tracing_unbounded;
 	use sp_blockchain::HeaderBackend as _;
 	use substrate_test_runtime_client::{TestClientBuilder, TestClientBuilderExt};
 
diff --git a/client/finality-grandpa/src/until_imported.rs b/client/finality-grandpa/src/until_imported.rs
index deb657726..45c7a56fb 100644
--- a/client/finality-grandpa/src/until_imported.rs
+++ b/client/finality-grandpa/src/until_imported.rs
@@ -37,7 +37,7 @@ use log::{debug, warn};
 use parking_lot::Mutex;
 use prometheus_endpoint::{register, Gauge, PrometheusError, Registry, U64};
 use sc_client_api::{BlockImportNotification, ImportNotifications};
-use sc_utils::mpsc::TracingUnboundedReceiver;
+use sc_foo::mpsc::TracingUnboundedReceiver;
 use sp_finality_grandpa::AuthorityId;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 
@@ -561,7 +561,7 @@ mod tests {
 	use futures::future::Either;
 	use futures_timer::Delay;
 	use sc_client_api::BlockImportNotification;
-	use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
+	use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedSender};
 	use sp_consensus::BlockOrigin;
 	use substrate_test_runtime_client::runtime::{Block, Hash, Header};
 
diff --git a/client/network/Cargo.toml b/client/network/Cargo.toml
index de62a534f..7b9fab97a 100644
--- a/client/network/Cargo.toml
+++ b/client/network/Cargo.toml
@@ -55,7 +55,7 @@ sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/comm
 sc-consensus = { version = "0.10.0-dev", path = "../consensus/common" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
 thiserror = "1"
 unsigned-varint = { version = "0.6.0", features = [
diff --git a/client/network/src/on_demand_layer.rs b/client/network/src/on_demand_layer.rs
index 5bac05c7a..a2917a6e2 100644
--- a/client/network/src/on_demand_layer.rs
+++ b/client/network/src/on_demand_layer.rs
@@ -27,7 +27,7 @@ use sc_client_api::{
 	RemoteChangesRequest, RemoteHeaderRequest, RemoteReadChildRequest, RemoteReadRequest,
 	StorageProof,
 };
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_blockchain::Error as ClientError;
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 use std::{
diff --git a/client/network/src/service.rs b/client/network/src/service.rs
index 6b2928510..adb62d283 100644
--- a/client/network/src/service.rs
+++ b/client/network/src/service.rs
@@ -70,7 +70,7 @@ use metrics::{Histogram, HistogramVec, MetricSources, Metrics};
 use parking_lot::Mutex;
 use sc_consensus::{BlockImportError, BlockImportStatus, ImportQueue, Link};
 use sc_peerset::PeersetHandle;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
 use std::{
 	borrow::Cow,
diff --git a/client/offchain/Cargo.toml b/client/offchain/Cargo.toml
index a7ff572e9..bf6556e4e 100644
--- a/client/offchain/Cargo.toml
+++ b/client/offchain/Cargo.toml
@@ -29,7 +29,7 @@ sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
 sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 threadpool = "1.7"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
diff --git a/client/offchain/src/api/http.rs b/client/offchain/src/api/http.rs
index ce9fb298d..367daf3e7 100644
--- a/client/offchain/src/api/http.rs
+++ b/client/offchain/src/api/http.rs
@@ -34,7 +34,7 @@ use futures::{channel::mpsc, future, prelude::*};
 use hyper::{client, Body, Client as HyperClient};
 use hyper_rustls::HttpsConnector;
 use log::error;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_core::offchain::{HttpError, HttpRequestId, HttpRequestStatus, Timestamp};
 use std::{
 	convert::TryFrom,
diff --git a/client/peerset/Cargo.toml b/client/peerset/Cargo.toml
index 9e83ede67..4b954c227 100644
--- a/client/peerset/Cargo.toml
+++ b/client/peerset/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 futures = "0.3.9"
 libp2p = { version = "0.39.1", default-features = false }
-sc-utils = { version = "4.0.0-dev", path = "../utils"}
+sc-foo = { version = "4.0.0-dev", path = "../utils"}
 log = "0.4.8"
 serde_json = "1.0.41"
 wasm-timer = "0.2"
diff --git a/client/peerset/src/lib.rs b/client/peerset/src/lib.rs
index ecaa1d9f5..747824d17 100644
--- a/client/peerset/src/lib.rs
+++ b/client/peerset/src/lib.rs
@@ -36,7 +36,7 @@ mod peersstate;
 
 use futures::prelude::*;
 use log::{debug, error, trace};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use serde_json::json;
 use std::{
 	collections::{HashMap, HashSet, VecDeque},
diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
index 9957bc999..173588dc8 100644
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0.41"
 sp-session = { version = "4.0.0-dev", path = "../../primitives/session" }
 sp-offchain = { version = "4.0.0-dev", path = "../../primitives/offchain" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }
 sp-keystore = { version = "0.10.0-dev", path = "../../primitives/keystore" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
diff --git a/client/rpc/src/system/mod.rs b/client/rpc/src/system/mod.rs
index f99994e41..52ed2bd9c 100644
--- a/client/rpc/src/system/mod.rs
+++ b/client/rpc/src/system/mod.rs
@@ -22,7 +22,7 @@ use self::error::Result;
 use futures::{channel::oneshot, FutureExt};
 use sc_rpc_api::{DenyUnsafe, Receiver};
 use sc_tracing::logging;
-use sc_utils::mpsc::TracingUnboundedSender;
+use sc_foo::mpsc::TracingUnboundedSender;
 use sp_runtime::traits::{self, Header as HeaderT};
 
 pub use self::{
diff --git a/client/rpc/src/system/tests.rs b/client/rpc/src/system/tests.rs
index cc794b884..dbb0ffbe4 100644
--- a/client/rpc/src/system/tests.rs
+++ b/client/rpc/src/system/tests.rs
@@ -21,7 +21,7 @@ use super::*;
 use assert_matches::assert_matches;
 use futures::{executor, prelude::*};
 use sc_network::{self, config::Role, PeerId};
-use sc_utils::mpsc::tracing_unbounded;
+use sc_foo::mpsc::tracing_unbounded;
 use std::{
 	env,
 	io::{BufRead, BufReader, Write},
diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml
index b79e95fbb..a645eae1a 100644
--- a/client/service/Cargo.toml
+++ b/client/service/Cargo.toml
@@ -39,7 +39,7 @@ sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
 sp-runtime = { version = "4.0.0-dev", path = "../../primitives/runtime" }
 sp-trie = { version = "4.0.0-dev", path = "../../primitives/trie" }
 sp-externalities = { version = "0.10.0-dev", path = "../../primitives/externalities" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 sp-version = { version = "4.0.0-dev", path = "../../primitives/version" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
diff --git a/client/service/src/builder.rs b/client/service/src/builder.rs
index f0c037aee..8a1f9adcd 100644
--- a/client/service/src/builder.rs
+++ b/client/service/src/builder.rs
@@ -49,7 +49,7 @@ use sc_network::{
 };
 use sc_telemetry::{telemetry, ConnectionMessage, Telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::MaintainedTransactionPool;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_consensus::block_validation::{
diff --git a/client/service/src/client/client.rs b/client/service/src/client/client.rs
index f7d93d036..cacfd23f2 100644
--- a/client/service/src/client/client.rs
+++ b/client/service/src/client/client.rs
@@ -61,7 +61,7 @@ use sp_blockchain::{
 };
 use sp_consensus::{BlockOrigin, BlockStatus, Error as ConsensusError};
 
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedSender};
 use sp_core::{
 	convert_hash,
 	storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs
index ede6f01a4..f19c574a6 100644
--- a/client/service/src/lib.rs
+++ b/client/service/src/lib.rs
@@ -41,7 +41,7 @@ use futures::{stream, Future, FutureExt, Stream, StreamExt};
 use log::{debug, error, warn};
 use parity_util_mem::MallocSizeOf;
 use sc_network::PeerId;
-use sc_utils::mpsc::TracingUnboundedReceiver;
+use sc_foo::mpsc::TracingUnboundedReceiver;
 use sp_runtime::{
 	generic::BlockId,
 	traits::{Block as BlockT, Header as HeaderT},
diff --git a/client/service/src/metrics.rs b/client/service/src/metrics.rs
index 4d3c6df92..99cd1fe34 100644
--- a/client/service/src/metrics.rs
+++ b/client/service/src/metrics.rs
@@ -25,7 +25,7 @@ use sc_client_api::{ClientInfo, UsageProvider};
 use sc_network::{config::Role, NetworkService, NetworkStatus};
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sc_transaction_pool_api::{MaintainedTransactionPool, PoolStatus};
-use sc_utils::metrics::register_globals;
+use sc_foo::metrics::register_globals;
 use sp_api::ProvideRuntimeApi;
 use sp_runtime::traits::{Block, NumberFor, SaturatedConversion, UniqueSaturatedInto};
 use std::{
diff --git a/client/service/src/task_manager/mod.rs b/client/service/src/task_manager/mod.rs
index 7842acdf0..d8613a0a9 100644
--- a/client/service/src/task_manager/mod.rs
+++ b/client/service/src/task_manager/mod.rs
@@ -33,7 +33,7 @@ use prometheus_endpoint::{
 	exponential_buckets, register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError,
 	Registry, U64,
 };
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use std::{panic, pin::Pin, result::Result};
 use tracing_futures::Instrument;
 
diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
index 2184af819..e0224b436 100644
--- a/client/transaction-pool/Cargo.toml
+++ b/client/transaction-pool/Cargo.toml
@@ -29,7 +29,7 @@ sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
-sc-utils = { version = "4.0.0-dev", path = "../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../utils" }
 serde = { version = "1.0.126", features = ["derive"] }
 linked-hash-map = "0.5.4"
 retain_mut = "0.1.3"
diff --git a/client/transaction-pool/graph/Cargo.toml b/client/transaction-pool/graph/Cargo.toml
index b49cadc51..57de7740c 100644
--- a/client/transaction-pool/graph/Cargo.toml
+++ b/client/transaction-pool/graph/Cargo.toml
@@ -20,7 +20,7 @@ log = "0.4.8"
 parking_lot = "0.11.1"
 serde = { version = "1.0.101", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
-sc-utils = { version = "4.0.0-dev", path = "../../utils" }
+sc-foo = { version = "4.0.0-dev", path = "../../utils" }
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" }
diff --git a/client/transaction-pool/src/graph/watcher.rs b/client/transaction-pool/src/graph/watcher.rs
index 975ee6608..eea5c604d 100644
--- a/client/transaction-pool/src/graph/watcher.rs
+++ b/client/transaction-pool/src/graph/watcher.rs
@@ -20,7 +20,7 @@
 
 use futures::Stream;
 use sc_transaction_pool_api::TransactionStatus;
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 
 /// Extrinsic watcher.
 ///
diff --git a/client/transaction-pool/src/revalidation.rs b/client/transaction-pool/src/revalidation.rs
index a8b2c1d32..fa1072970 100644
--- a/client/transaction-pool/src/revalidation.rs
+++ b/client/transaction-pool/src/revalidation.rs
@@ -25,7 +25,7 @@ use std::{
 };
 
 use crate::graph::{ChainApi, ExtrinsicHash, NumberFor, Pool, ValidatedTransaction};
-use sc_utils::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
+use sc_foo::mpsc::{tracing_unbounded, TracingUnboundedReceiver, TracingUnboundedSender};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{SaturatedConversion, Zero},
diff --git a/client/utils/Cargo.toml b/client/utils/Cargo.toml
index 99765dd50..b99f43c5d 100644
--- a/client/utils/Cargo.toml
+++ b/client/utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sc-utils"
+name = "sc-foo"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
-- 
2.33.0

joao-paulo-parity · 2021-09-07T23:36:23Z

.maintain/gitlab/check_polkadot_companion_build.sh

+# FIXME: update jq in the CI file
+
+jq="$PWD/jq16"
+curl -sqL https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -o "$jq"


need to address this before merging on the CI image

awaiting for https://github.com/paritytech/ci_cd/issues/193

TriplEight

LGTM

.gitlab-ci.yml

#9721 (comment)

TriplEight · 2021-09-13T08:47:44Z

We're still blocked with these dudes:
tests (prevent updating to a new Rust version)
#9637
paritytech/polkadot#3807
dockerfiles (stops from upgrading to ubuntu)
paritytech/polkadot#3828
#9753

…anion-deleted-renamed

joao-paulo-parity · 2021-09-24T15:13:59Z

This is no longer blocked and the pipeline is passing.

joao-paulo-parity · 2021-09-28T12:27:41Z

I'll open a PR for https://github.com/paritytech/scripts/blob/master/dockerfiles/ci-linux/Dockerfile. Until it's put into effect, this is blocked.

joao-paulo-parity · 2021-10-01T02:28:33Z

I'll open a PR for https://github.com/paritytech/scripts/blob/master/dockerfiles/ci-linux/Dockerfile. Until it's put into effect, this is blocked.

The PR was merged and so this branch is unblocked again

joao-paulo-parity · 2021-10-14T12:39:04Z

This is obsolete after #9749

joao-paulo-parity self-assigned this Sep 7, 2021

joao-paulo-parity force-pushed the jp/companion-deleted-renamed branch from c42a1b1 to 1f68c06 Compare September 7, 2021 15:22

joao-paulo-parity marked this pull request as ready for review September 7, 2021 15:25

joao-paulo-parity requested a review from a team as a code owner September 7, 2021 15:25

joao-paulo-parity changed the title ~~Update check_polkadot_companion_build~~ [WIP] Update check_polkadot_companion_build Sep 7, 2021

joao-paulo-parity requested review from andresilva and tomusdrw as code owners September 7, 2021 17:24

joao-paulo-parity force-pushed the jp/companion-deleted-renamed branch from 49fbccf to dbe9c4b Compare September 7, 2021 21:13

joao-paulo-parity commented Sep 7, 2021

View reviewed changes

.gitlab-ci.yml Outdated Show resolved Hide resolved

joao-paulo-parity force-pushed the jp/companion-deleted-renamed branch from 0977a45 to dbe9c4b Compare September 7, 2021 22:28

joao-paulo-parity added 8 commits September 7, 2021 19:52

update check_polkadot_companion_build for taking care of deleted or r…

46af33d

…enamed crates and simplify it a bit

scope load_our_crates into a function to ensure variables don't leak

9275261

simplify comparison

77f3524

sc_utils => sc_foo (for testing's sake)

0c258de

have stricter script options

82dc31d

no useless file substitution

a572229

isolate check-polkadot-companion-build for faster iteration

56e0a67

deletion will be reverted later

jq update workaround

87e91fd

joao-paulo-parity force-pushed the jp/companion-deleted-renamed branch from 0e3f892 to 87e91fd Compare September 7, 2021 22:53

joao-paulo-parity added 3 commits September 7, 2021 20:16

fix pattern comparison

a8d3de2

improve error message

40e9103

Revert "sc_utils => sc_foo (for testing's sake)"

766e5bd

This reverts commit 0c258de.

joao-paulo-parity commented Sep 7, 2021

View reviewed changes

joao-paulo-parity marked this pull request as draft September 7, 2021 23:38

joao-paulo-parity changed the title ~~[WIP] Update check_polkadot_companion_build~~ Update check_polkadot_companion_build Sep 8, 2021

TriplEight reviewed Sep 8, 2021

View reviewed changes

.gitlab-ci.yml Show resolved Hide resolved

more informative and readable code

05e0550

joao-paulo-parity mentioned this pull request Sep 9, 2021

[CI] Add cumulus + beefy companions #9010

Closed

offer suggestion on how to solve renamed and deleted crates' issues

e06e297

joao-paulo-parity added 2 commits September 10, 2021 06:24

Merge remote-tracking branch 'origin' into jp/companion-deleted-renamed

147590e

merge master

7b450db

joao-paulo-parity marked this pull request as ready for review September 10, 2021 09:40

joao-paulo-parity requested a review from a team September 10, 2021 09:43

joao-paulo-parity added A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Sep 10, 2021

joao-paulo-parity added 2 commits September 10, 2021 06:53

remove dependency

9cb4b8a

#9721 (comment)

make error handling more robust

7aca1eb

joao-paulo-parity mentioned this pull request Sep 10, 2021

Check all project dependents instead of just Polkadot #9749

Merged

newlines

b9e919b

joao-paulo-parity changed the title ~~Update check_polkadot_companion_build~~ [BLOCKED] Update check_polkadot_companion_build Sep 13, 2021

Merge branch 'master' of github.com:paritytech/substrate into jp/comp…

583a134

…anion-deleted-renamed

joao-paulo-parity changed the title ~~[BLOCKED] Update check_polkadot_companion_build~~ Update check_polkadot_companion_build Sep 24, 2021

joao-paulo-parity requested review from TriplEight and rcny September 24, 2021 15:14

TriplEight approved these changes Sep 28, 2021

View reviewed changes

joao-paulo-parity changed the title ~~Update check_polkadot_companion_build~~ [BLOCKED] Update check_polkadot_companion_build Sep 28, 2021

joao-paulo-parity mentioned this pull request Sep 28, 2021

Install jq from Github Releases paritytech/scripts#348

Merged

Merge branch 'master' into jp/companion-deleted-renamed

79f0eb3

joao-paulo-parity changed the title ~~[BLOCKED] Update check_polkadot_companion_build~~ Update check_polkadot_companion_build Sep 30, 2021

Merge branch 'master' into jp/companion-deleted-renamed

397aeb9

Merge branch 'master' into jp/companion-deleted-renamed

c592652

joao-paulo-parity closed this Oct 14, 2021

joao-paulo-parity deleted the jp/companion-deleted-renamed branch October 14, 2021 12:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update check_polkadot_companion_build #9721

Update check_polkadot_companion_build #9721

joao-paulo-parity commented Sep 7, 2021 •

edited

Loading

joao-paulo-parity commented Sep 7, 2021

joao-paulo-parity Sep 7, 2021

TriplEight left a comment

TriplEight commented Sep 13, 2021

joao-paulo-parity commented Sep 24, 2021

joao-paulo-parity commented Sep 28, 2021

joao-paulo-parity commented Oct 1, 2021

joao-paulo-parity commented Oct 14, 2021

Update check_polkadot_companion_build #9721

Update check_polkadot_companion_build #9721

Conversation

joao-paulo-parity commented Sep 7, 2021 • edited Loading

joao-paulo-parity commented Sep 7, 2021

joao-paulo-parity Sep 7, 2021

Choose a reason for hiding this comment

TriplEight left a comment

Choose a reason for hiding this comment

TriplEight commented Sep 13, 2021

joao-paulo-parity commented Sep 24, 2021

joao-paulo-parity commented Sep 28, 2021

joao-paulo-parity commented Oct 1, 2021

joao-paulo-parity commented Oct 14, 2021

joao-paulo-parity commented Sep 7, 2021 •

edited

Loading