Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
488d0a9
Reset code, almost ready for PR
expenses Aug 14, 2020
ddc7e3e
Merge remote-tracking branch 'origin/master' into ashley-chain-spec
expenses Aug 14, 2020
15dcb28
Improved build_hardcoded_spec
expenses Aug 14, 2020
ecb2f56
Fix line widths
expenses Aug 14, 2020
837c5f7
Fix tests
expenses Aug 14, 2020
42d88d5
Fix sc-service-test
expenses Aug 14, 2020
4288dc4
Suggestions from code review
expenses Aug 14, 2020
44ff9f9
Rename to LightSyncState
expenses Aug 14, 2020
a6b5491
It's not syncing :^(
expenses Aug 17, 2020
c67d005
t Merge remote-tracking branch 'origin/master' into ashley-chain-spec…
expenses Aug 17, 2020
346b711
It syncs!
expenses Aug 17, 2020
6447b85
Remove rpc call
expenses Aug 17, 2020
1adad2e
Convert spaces to tabs
expenses Aug 17, 2020
9372667
Moved sc-service things to export_sync_state.rs
expenses Aug 17, 2020
db2da96
Fix tests
expenses Aug 17, 2020
b530147
Wait for syncing with network_status_sinks
expenses Aug 17, 2020
004a8a4
Remove sc-network from node-template
expenses Aug 17, 2020
ea62d80
Apply suggestions from code review
expenses Aug 17, 2020
9b558eb
Various changes, split the flag up into 2 pieces to make testing easier.
expenses Aug 18, 2020
fd1d2b1
Update client/cli/src/commands/build_spec_cmd.rs
expenses Aug 18, 2020
57cbb15
Merge remote-tracking branch 'origin/master' into ashley-chain-spec
expenses Aug 19, 2020
fa51717
Revert a lot of changes
expenses Aug 19, 2020
285c5af
Merge remote-tracking branch 'origin/master' into ashley-chain-spec
expenses Aug 24, 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
Convert spaces to tabs
  • Loading branch information
expenses committed Aug 17, 2020
commit 1adad2e524e8cd27c8d4b54e70b990ff0b284cd6
26 changes: 13 additions & 13 deletions client/cli/src/commands/export_sync_state_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ use sp_runtime::traits::Block as BlockT;
pub struct ExportSyncStateCmd {
/// Force raw genesis storage output in the chain spec.
#[structopt(long = "raw")]
pub raw: bool,
#[allow(missing_docs)]
pub raw: bool,
#[allow(missing_docs)]
#[structopt(flatten)]
pub shared_params: SharedParams,

Expand All @@ -49,29 +49,29 @@ impl ExportSyncStateCmd {
pub async fn run<B, CL, BA, SO>(
&self,
mut spec: Box<dyn ChainSpec>,
client: Arc<CL>,
client: Arc<CL>,
backend: Arc<BA>,
mut sync_oracle: SO,
) -> error::Result<()>
where
B: BlockT,
CL: sp_blockchain::HeaderBackend<B>,
) -> error::Result<()>
where
B: BlockT,
CL: sp_blockchain::HeaderBackend<B>,
BA: sc_service::MaybeChtRootStorageProvider<B>,
SO: sp_consensus::SyncOracle,
{
{
futures::future::poll_fn(|_| {
match sync_oracle.is_major_syncing() || sync_oracle.is_offline() {
true => Poll::Pending,
false => Poll::Ready(())
}
}).await;

info!("Building chain spec");
info!("Building chain spec");

let light_sync_state = sc_service::build_light_sync_state(client, backend)
.map_err(|err| err.to_string())?;
let light_sync_state = sc_service::build_light_sync_state(client, backend)
.map_err(|err| err.to_string())?;

spec.set_light_sync_state(light_sync_state.to_serializable());
spec.set_light_sync_state(light_sync_state.to_serializable());

let json = sc_service::chain_ops::build_spec(&*spec, self.raw)?;
if std::io::stdout().write_all(json.as_bytes()).is_err() {
Expand Down