Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5178a3f
WIP
expenses Jun 12, 2020
9bb0129
Making progress
expenses Jun 15, 2020
91767ac
Almost ready
expenses Jun 15, 2020
3de5fce
Get service tests compiling
expenses Jun 16, 2020
937ad16
Fix node screenshot
expenses Jun 16, 2020
8d84167
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 16, 2020
30b8c65
Line widths
expenses Jun 18, 2020
a09301e
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 18, 2020
5bcf9f6
Fix node cli tests
expenses Jun 18, 2020
01e3ea0
Fix node cli warning
expenses Jun 18, 2020
1290452
ChainComponents -> ServiceComponents, fix tests
expenses Jun 18, 2020
11e3203
make spawn_handle public
expenses Jun 19, 2020
04d82e1
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 22, 2020
55df8af
Remove spawnnamed impl for taskmanager
expenses Jun 22, 2020
4e11e59
Move the keep alive stuff to the task manager
expenses Jun 23, 2020
22048cf
Move the telemetry, base path, rpc keep_alive to the service builder
expenses Jun 23, 2020
b5b335a
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 23, 2020
8ae7a04
Make the task manager keep alive an internal detail
expenses Jun 24, 2020
3319c11
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 24, 2020
f0a8f35
Rewrite the browser start_client future
expenses Jun 24, 2020
4546435
Remove run_node etc
expenses Jun 24, 2020
f42df6c
Revert my personal changes to browser-demo/build.sh
expenses Jun 24, 2020
0ad4e40
use |config|
expenses Jun 24, 2020
d066c02
Add a runtime_version function to SubstrateCli
expenses Jun 24, 2020
1305100
Reexport role and runtime version from sc cli
expenses Jun 24, 2020
1326a02
Update Cargo.lock
expenses Jun 24, 2020
772b757
runtime_version -> native_runtime_version
expenses Jun 25, 2020
efae0da
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 25, 2020
fe9d37a
Pass chain spec to native_runtime_version for polkadot
expenses Jun 25, 2020
97112f2
Merge remote-tracking branch 'parity/master' into ashley-service-mult…
expenses Jun 29, 2020
9c2e782
Fix line widths
expenses Jun 29, 2020
1f71076
Traitify ServiceComponents Client
expenses Jun 30, 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
runtime_version -> native_runtime_version
  • Loading branch information
expenses committed Jun 25, 2020
commit 772b7572bb20f9bb7e5b262edbbf47033c40a07e
2 changes: 1 addition & 1 deletion bin/node-template/node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl SubstrateCli for Cli {
})
}

fn runtime_version() -> &'static RuntimeVersion {
fn native_runtime_version() -> &'static RuntimeVersion {
&node_template_runtime::VERSION
}
}
Expand Down
2 changes: 1 addition & 1 deletion bin/node/cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl SubstrateCli for Cli {
})
}

fn runtime_version() -> &'static RuntimeVersion {
fn native_runtime_version() -> &'static RuntimeVersion {
&node_runtime::VERSION
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ pub trait SubstrateCli: Sized {
}

/// Runtime version.
fn runtime_version() -> &'static RuntimeVersion;
fn native_runtime_version() -> &'static RuntimeVersion;
}

/// Initialize the logger
Expand Down
2 changes: 1 addition & 1 deletion client/cli/src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ impl<C: SubstrateCli> Runner<C> {
self.config.database,
self.config.database.path().map_or_else(|| "<unknown>".to_owned(), |p| p.display().to_string())
);
info!("⛓ Native runtime: {}", C::runtime_version());
info!("⛓ Native runtime: {}", C::native_runtime_version());
}

/// A helper function that runs a future with tokio and stops if the process receives the signal
Expand Down