mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 04:37:57 +00:00
overseer becomes orchestra (#5542)
* rename overseer-gen to orchestra Also drop `gum` and use `tracing`. * make orchestra compile as standalone * introduce Spawner trait to split from sp_core Finalizes the independence of orchestra from polkadot-overseer * slip of the pen * other fixins * remove unused import * Update node/overseer/orchestra/proc-macro/src/impl_builder.rs Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> * Update node/overseer/orchestra/proc-macro/src/impl_builder.rs Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> * orchestra everywhere * leaky data * Bump scale-info from 2.1.1 to 2.1.2 (#5552) Bumps [scale-info](https://github.com/paritytech/scale-info) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/paritytech/scale-info/releases) - [Changelog](https://github.com/paritytech/scale-info/blob/master/CHANGELOG.md) - [Commits](https://github.com/paritytech/scale-info/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: scale-info dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add missing markdown code block delimiter (#5555) * bitfield-signing: remove util::jobs usage (#5523) * Switch to pooling copy-on-write instantiation strategy for WASM (companion for Substrate#11232) (#5337) * Switch to pooling copy-on-write instantiation strategy for WASM * Fix compilation of `polkadot-test-service` * Update comments * Move `max_memory_size` to `Semantics` * Rename `WasmInstantiationStrategy` to `WasmtimeInstantiationStrategy` * Update a safety comment * update lockfile for {"substrate"} Co-authored-by: parity-processbot <> * Fix build Co-authored-by: Vsevolod Stakhov <vsevolod.stakhov@parity.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Malte Kliemann <mail@maltekliemann.com> Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Koute <koute@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
d9eff4ecd4
commit
450ca2baca
@@ -70,12 +70,12 @@ where
|
||||
let mut i = 0;
|
||||
loop {
|
||||
match ctx.recv().await {
|
||||
Ok(FromOverseer::Communication { .. }) => {
|
||||
Ok(FromOrchestra::Communication { .. }) => {
|
||||
let _ = sender.send(i).await;
|
||||
i += 1;
|
||||
continue
|
||||
},
|
||||
Ok(FromOverseer::Signal(OverseerSignal::Conclude)) => return Ok(()),
|
||||
Ok(FromOrchestra::Signal(OverseerSignal::Conclude)) => return Ok(()),
|
||||
Err(_) => return Ok(()),
|
||||
_ => (),
|
||||
}
|
||||
@@ -121,7 +121,7 @@ where
|
||||
continue
|
||||
}
|
||||
match ctx.try_recv().await {
|
||||
Ok(Some(FromOverseer::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(FromOrchestra::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(_)) => continue,
|
||||
Err(_) => return Ok(()),
|
||||
_ => (),
|
||||
@@ -318,8 +318,8 @@ where
|
||||
future: Box::pin(async move {
|
||||
loop {
|
||||
match ctx.try_recv().await {
|
||||
Ok(Some(FromOverseer::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(FromOverseer::Signal(s))) => {
|
||||
Ok(Some(FromOrchestra::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(FromOrchestra::Signal(s))) => {
|
||||
sender.send(s).await.unwrap();
|
||||
continue
|
||||
},
|
||||
@@ -350,8 +350,8 @@ where
|
||||
future: Box::pin(async move {
|
||||
loop {
|
||||
match ctx.try_recv().await {
|
||||
Ok(Some(FromOverseer::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(FromOverseer::Signal(s))) => {
|
||||
Ok(Some(FromOrchestra::Signal(OverseerSignal::Conclude))) => break,
|
||||
Ok(Some(FromOrchestra::Signal(s))) => {
|
||||
sender.send(s).await.unwrap();
|
||||
continue
|
||||
},
|
||||
@@ -754,15 +754,15 @@ where
|
||||
future: Box::pin(async move {
|
||||
loop {
|
||||
match ctx.try_recv().await {
|
||||
Ok(Some(FromOverseer::Signal(OverseerSignal::Conclude))) => {
|
||||
Ok(Some(FromOrchestra::Signal(OverseerSignal::Conclude))) => {
|
||||
self.stop_signals_received.fetch_add(1, atomic::Ordering::SeqCst);
|
||||
break
|
||||
},
|
||||
Ok(Some(FromOverseer::Signal(_))) => {
|
||||
Ok(Some(FromOrchestra::Signal(_))) => {
|
||||
self.signals_received.fetch_add(1, atomic::Ordering::SeqCst);
|
||||
continue
|
||||
},
|
||||
Ok(Some(FromOverseer::Communication { .. })) => {
|
||||
Ok(Some(FromOrchestra::Communication { .. })) => {
|
||||
self.msgs_received.fetch_add(1, atomic::Ordering::SeqCst);
|
||||
continue
|
||||
},
|
||||
@@ -1139,7 +1139,7 @@ fn context_holds_onto_message_until_enough_signals_received() {
|
||||
|
||||
let test_fut = async move {
|
||||
signal_tx.send(OverseerSignal::Conclude).await.unwrap();
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOverseer::Signal(OverseerSignal::Conclude));
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOrchestra::Signal(OverseerSignal::Conclude));
|
||||
|
||||
assert_eq!(ctx.signals_received.load(), 1);
|
||||
bounded_tx
|
||||
@@ -1158,9 +1158,9 @@ fn context_holds_onto_message_until_enough_signals_received() {
|
||||
assert!(ctx.pending_incoming.is_some());
|
||||
|
||||
signal_tx.send(OverseerSignal::Conclude).await.unwrap();
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOverseer::Signal(OverseerSignal::Conclude));
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOverseer::Communication { msg: () });
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOverseer::Communication { msg: () });
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOrchestra::Signal(OverseerSignal::Conclude));
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOrchestra::Communication { msg: () });
|
||||
assert_matches!(ctx.recv().await.unwrap(), FromOrchestra::Communication { msg: () });
|
||||
assert!(ctx.pending_incoming.is_none());
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user