Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Prefix logs of parachain and relaychain differently + remove light client of relay chain #109

Merged
cecton merged 9 commits into from
Jun 11, 2020
Merged

Prefix logs of parachain and relaychain differently + remove light client of relay chain #109

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46d8a93
Update substrate & polkadot branches to cecton-cumulus-branch
cecton Jun 9, 2020
47f4d3e
Use new API to remove unwanted code
cecton Jun 9, 2020
288885b
Clean-up unused imports
cecton Jun 9, 2020
6090a5e
Use different informant prefix for parachain and relaychain
cecton Jun 9, 2020
bb1ff51
fix Cargo.lock
cecton Jun 10, 2020
22052a6
Now it is perfect
cecton Jun 11, 2020
0386426
Spacing
cecton Jun 11, 2020
580f535
Revert branch changing for merge
cecton Jun 11, 2020
c088d61
Removed Clone from structopts
cecton Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Now it is perfect
  • Loading branch information
@cecton
cecton committed Jun 11, 2020
commit 22052a648bcbdb27d81500a9645ddcfd85a67765
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ parking_lot = '0.9.0'
trie-root = '0.15.2'
codec = { package = 'parity-scale-codec', version = '1.0.0' }
structopt = "0.3.3"
ansi_term = "0.12.1"

# Parachain dependencies
parachain-runtime = { package = "cumulus-test-parachain-runtime", path = "runtime" }
Expand Down
5 changes: 3 additions & 2 deletions test/parachain/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.

use ansi_term::Color;
use std::sync::Arc;
use sc_executor::native_executor_instance;
use sc_service::{AbstractService, Configuration};
Expand Down Expand Up @@ -91,7 +92,7 @@ pub fn run_collator(
let block_announce_validator = DelayedBlockAnnounceValidator::new();
let block_announce_validator_copy = block_announce_validator.clone();
let service = builder
.with_informant_prefix("[ParaChain]".to_string())?
.with_informant_prefix(format!("[{}]", Color::Yellow.bold().paint("Parachain")))?
.with_finality_proof_provider(|client, backend| {
// GenesisAuthoritySetProvider is implemented for StorageAndProofProvider
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Expand Down Expand Up @@ -131,7 +132,7 @@ pub fn run_collator(
crate::PARA_ID,
key,
polkadot_config,
Some("[RelayChain]".to_string()),
Some(format!("[{}]", Color::Blue.bold().paint("Relaychain"))),
).map(|_| ());
service.spawn_essential_task("polkadot", polkadot_future);

Expand Down