Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #207

Merged
merged 26 commits into from
Dec 27, 2019
Merged

Develop #207

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
45189e5
Merge pull request #3 from darwinia-network/master
freehere107 Sep 2, 2019
d141926
Merge pull request #4 from darwinia-network/master
freehere107 Sep 3, 2019
4faba11
Merge pull request #5 from darwinia-network/master
freehere107 Dec 26, 2019
b5437f9
try: fix ci
aurexav Dec 26, 2019
3c3a2dd
Merge remote-tracking branch 'upstream/develop' into develop
aurexav Dec 26, 2019
8994750
update: format
aurexav Dec 26, 2019
b4c245e
remove: dangling comma
aurexav Dec 26, 2019
0d99a6f
Merge pull request #201 from AurevoirXavier/develop
hackfisher Dec 26, 2019
327553c
fix: test to pass CI
aurexav Dec 26, 2019
63af175
update: test
aurexav Dec 26, 2019
2585682
patch: #203
aurexav Dec 26, 2019
63e13a2
Merge pull request #202 from AurevoirXavier/develop
hackfisher Dec 26, 2019
4c0430c
Merge pull request #6 from darwinia-network/master
freehere107 Dec 27, 2019
b5b07c9
add develop branch to ci
Dec 27, 2019
d817205
CI for Develop Branch (#204)
aurexav Dec 27, 2019
07f5665
update: CI
aurexav Dec 27, 2019
adc02f0
add: test
aurexav Dec 27, 2019
5bc75c3
update: doc
aurexav Dec 27, 2019
aca1c7a
add: CI build status
aurexav Dec 27, 2019
2533c9e
update: format
aurexav Dec 27, 2019
fa5cb12
add: License
aurexav Dec 27, 2019
af95471
update: rustfmt configuration
aurexav Dec 27, 2019
ebe19cb
update: format
aurexav Dec 27, 2019
d54c784
update: genesis
aurexav Dec 27, 2019
776be04
Merge remote-tracking branch 'origin/test' into develop
aurexav Dec 27, 2019
1cd25e7
add: logo
aurexav Dec 27, 2019
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
update: doc
  • Loading branch information
@aurexav
aurexav committed Dec 27, 2019
commit 5bc75c3d0da9901128b551705f3027c94ebbc410
2 changes: 1 addition & 1 deletion node/cli/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ pub fn local_testnet_config() -> ChainSpec {
)
}

/// c￿rayfish testnet config (multivalidator Alice + Bob)
/// IceFrog testnet config (multivalidator Alice + Bob)
pub fn icefrog_testnet_config() -> ChainSpec {
fn icefrog_config_genesis() -> GenesisConfig {
darwinia_genesis(
Expand Down