Skip to content

Commit b61d59f

Browse files
weichweichntn-x2
andauthored
refactor: rename standalone to kestrel (#554)
## fixes https://github.com/KILTprotocol/ticket/issues/2794 * i decided to remove the mashnet naming entirely. Mashnet is the old thing from the very beginning. * the mashnet-node was renamed to standalone-node since it's not specific to kestrel (there could be a second runtime executed in with this node, like we do it for the parachain-node) Co-authored-by: Antonio <antonio@kilt.io>
1 parent e3b7729 commit b61d59f

15 files changed

+126
-126
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build:
4040
- /^[dev-](\w*-)*[0-9]?$/
4141
variables:
4242
DOCKER_HUB_PARACHAIN: "kiltprotocol/kilt-node"
43-
DOCKER_HUB_STANDALONE: "kiltprotocol/mashnet-node"
43+
DOCKER_HUB_STANDALONE: "kiltprotocol/standalone-node"
4444
before_script:
4545
- aws --version
4646
- docker --version

.maintain/build-image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ docker build \
1919
docker build \
2020
--cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
2121
--cache-from $AWS_REGISTRY/kilt/prototype-chain:$target_tag \
22-
--build-arg NODE_TYPE=mashnet-node \
23-
-t local/mashnet-node:$target_tag \
22+
--build-arg NODE_TYPE=standalone-node \
23+
-t local/standalone-node:$target_tag \
2424
.

.maintain/push-image.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ source_tag=$1
44
target_tag=$2
55

66
# publish to docker hub
7-
docker tag local/mashnet-node:$source_tag ${DOCKER_HUB_STANDALONE}:$target_tag
7+
docker tag local/standalone-node:$source_tag ${DOCKER_HUB_STANDALONE}:$target_tag
88
docker tag local/kilt-node:$source_tag ${DOCKER_HUB_PARACHAIN}:$target_tag
99

1010
docker push ${DOCKER_HUB_STANDALONE}:$target_tag
1111
docker push ${DOCKER_HUB_PARACHAIN}:$target_tag
1212

1313
# publish to AWS
14-
docker tag local/mashnet-node:$source_tag $AWS_REGISTRY/kilt/prototype-chain:$target_tag
14+
docker tag local/standalone-node:$source_tag $AWS_REGISTRY/kilt/prototype-chain:$target_tag
1515
docker tag local/kilt-node:$source_tag $AWS_REGISTRY/kilt-parachain/collator:$target_tag
1616

1717
docker push $AWS_REGISTRY/kilt/prototype-chain:$target_tag

Cargo.lock

+98-98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ kilt-runtime-api-public-credentials = {path = "runtime-api/public-credentials",
6868
kilt-runtime-api-staking = {path = "runtime-api/staking", default-features = false}
6969

7070
# Internal KILT runtimes (with default disabled)
71-
mashnet-node-runtime = {path = "runtimes/standalone", default-features = false}
71+
kestrel-runtime = {path = "runtimes/kestrel", default-features = false}
7272
peregrine-runtime = {path = "runtimes/peregrine", default-features = false}
7373
spiritnet-runtime = {path = "runtimes/spiritnet", default-features = false}
7474

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# KILT-node &middot; [![tests](https://gitlab.com/kiltprotocol/mashnet-node/badges/develop/pipeline.svg)](https://gitlab.com/kiltprotocol/mashnet-node/-/commits/develop)
1+
# KILT-node &middot; [![tests](https://gitlab.com/kiltprotocol/kilt-node/badges/develop/pipeline.svg)](https://gitlab.com/kiltprotocol/kilt-node/-/commits/develop)
22

33

44
<p align="center">

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version: "3"
33
services:
44
dev-node:
55
build: .
6-
image: local/mashnet-node
7-
command: ./target/release/mashnet-node --dev --ws-port 9944 --ws-external
6+
image: local/standalone-node
7+
command: ./target/release/standalone-node --dev --ws-port 9944 --ws-external
88
ports:
99
- 9944:9944
1010
sdk:

nodes/standalone/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ license-file.workspace = true
77
readme.workspace = true
88
repository.workspace = true
99
version.workspace = true
10-
name = "mashnet-node"
10+
name = "standalone-node"
1111
description = "Client for KILT standalone development chain."
1212
build = "build.rs"
1313

1414
[[bin]]
15-
name = "mashnet-node"
15+
name = "standalone-node"
1616
path = "src/main.rs"
1717

1818
[build-dependencies]
@@ -26,14 +26,14 @@ hex-literal.workspace = true
2626
futures = { workspace = true, features = ["thread-pool"]}
2727

2828
# Internal dependencies
29-
mashnet-node-runtime = {workspace = true, features = ["std"]}
29+
kestrel-runtime = {workspace = true, features = ["std"]}
3030
runtime-common = {workspace = true, features = ["std"]}
3131

3232
# Substrate dependencies
3333
frame-system = {workspace = true, features = ["std"]}
3434
pallet-transaction-payment = {workspace = true, features = ["std"]}
3535
sc-basic-authorship.workspace = true
36-
sc-cli.workspace = true
36+
sc-cli.workspace = true
3737
sc-client-api.workspace = true
3838
sc-consensus.workspace = true
3939
sc-consensus-aura.workspace = true
@@ -75,14 +75,14 @@ runtime-benchmarks = [
7575
"frame-benchmarking/runtime-benchmarks",
7676
"frame-benchmarking-cli/runtime-benchmarks",
7777
"frame-system/runtime-benchmarks",
78-
"mashnet-node-runtime/runtime-benchmarks",
78+
"kestrel-runtime/runtime-benchmarks",
7979
"runtime-common/runtime-benchmarks",
8080
"sc-service/runtime-benchmarks",
8181
"sp-runtime/runtime-benchmarks",
8282
]
8383
try-runtime = [
8484
"frame-system/try-runtime",
85-
"mashnet-node-runtime/try-runtime",
85+
"kestrel-runtime/try-runtime",
8686
"pallet-transaction-payment/try-runtime",
8787
"runtime-common/try-runtime",
8888
"try-runtime-cli",

nodes/standalone/src/benchmarking.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
2323
use crate::service::FullClient;
2424

25-
use mashnet_node_runtime as runtime;
25+
use kestrel_runtime as runtime;
2626
use runtime::{BalancesCall, SystemCall};
2727
use runtime_common::{AccountId, Balance, Signature};
2828
use sc_cli::Result;

nodes/standalone/src/chain_spec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
//! KILT chain specification
2020
21-
use mashnet_node_runtime::{
21+
use kestrel_runtime::{
2222
BalancesConfig, GenesisConfig, IndicesConfig, SessionConfig, SudoConfig, SystemConfig, WASM_BINARY,
2323
};
2424
use runtime_common::{AccountId, AccountPublic};
@@ -171,7 +171,7 @@ fn devnet_genesis(
171171
(
172172
x.0.clone(),
173173
x.0.clone(),
174-
mashnet_node_runtime::opaque::SessionKeys {
174+
kestrel_runtime::opaque::SessionKeys {
175175
aura: x.1.clone(),
176176
grandpa: x.2.clone(),
177177
},

nodes/standalone/src/command.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::{
2323
service,
2424
};
2525
use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
26-
use mashnet_node_runtime::opaque::Block;
26+
use kestrel_runtime::opaque::Block;
2727
use runtime_common::constants::EXISTENTIAL_DEPOSIT;
2828
use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
2929
use sc_service::PartialComponents;
@@ -63,7 +63,7 @@ impl SubstrateCli for Cli {
6363
}
6464

6565
fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
66-
&mashnet_node_runtime::VERSION
66+
&kestrel_runtime::VERSION
6767
}
6868
}
6969

nodes/standalone/src/service.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use sp_consensus_aura::ed25519::AuthorityPair as AuraPair;
2929

3030
use std::{sync::Arc, time::Duration};
3131

32-
use mashnet_node_runtime::{self, opaque::Block, RuntimeApi};
32+
use kestrel_runtime::{self, opaque::Block, RuntimeApi};
3333

3434
// Our native executor instance.
3535
pub struct ExecutorDispatch;
@@ -38,11 +38,11 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
3838
type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
3939

4040
fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
41-
mashnet_node_runtime::api::dispatch(method, data)
41+
kestrel_runtime::api::dispatch(method, data)
4242
}
4343

4444
fn native_version() -> sc_executor::NativeVersion {
45-
mashnet_node_runtime::native_version()
45+
kestrel_runtime::native_version()
4646
}
4747
}
4848

0 commit comments

Comments
 (0)