Switch to a model where the testnets are stricly associated with a network back-end type

This commit is contained in:
Zahary Karadjov 2019-06-20 16:43:53 +03:00
parent 44fc05f864
commit 1bcd94a7da
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
4 changed files with 7 additions and 5 deletions

View File

@ -12,7 +12,7 @@ source "$NETWORK_NAME.env"
cd ..
NIM_FLAGS="-d:release --lineTrace:on -d:chronicles_log_level=DEBUG -d:SECONDS_PER_SLOT=$SECONDS_PER_SLOT -d:SHARD_COUNT=$SHARD_COUNT -d:SLOTS_PER_EPOCH=$SLOTS_PER_EPOCH -d:DEFAULT_NETWORK=$NETWORK_NAME --hints:off --verbosity:0"
NIM_FLAGS="-d:release --lineTrace:on -d:chronicles_log_level=DEBUG -d:network_type=$NETWORK_TYPE -d:SECONDS_PER_SLOT=$SECONDS_PER_SLOT -d:SHARD_COUNT=$SHARD_COUNT -d:SLOTS_PER_EPOCH=$SLOTS_PER_EPOCH -d:DEFAULT_NETWORK=$NETWORK_NAME --hints:off --verbosity:0"
BEACON_NODE_BIN="build/${NETWORK_NAME}_node"
@ -29,7 +29,7 @@ echo "Done! You're now ready to connect to $NETWORK_NAME by running:"
echo
echo " $BEACON_NODE_BIN"
echo
echo "Database and configuration files placed in:"
echo "Database and configuration files will be placed in:"
echo
echo " ${HOME}/.cache/nimbus/BeaconNode/${NETWORK_NAME}"
echo

View File

@ -19,7 +19,7 @@ NETWORK_DIR=$WWW_DIR/$NETWORK_NAME
regenTestnetFiles() {
NIM_FLAGS="-d:release -d:SECONDS_PER_SLOT=$SECONDS_PER_SLOT -d:SHARD_COUNT=$SHARD_COUNT -d:SLOTS_PER_EPOCH=$SLOTS_PER_EPOCH ${2:-}"
NETWORK_FLAVOUR=$1
NETWORK_TYPE=$1
if [ ! -f $NETWORK_DIR/genesis.json ]; then
rm -f $NETWORK_DIR/*
@ -28,7 +28,7 @@ regenTestnetFiles() {
--outputDir="$NETWORK_DIR"
fi
nim c -d:"network_type=$NETWORK_FLAVOUR" -r $NIM_FLAGS beacon_chain/beacon_node \
nim c -d:"network_type=$NETWORK_TYPE" -r $NIM_FLAGS beacon_chain/beacon_node \
--network=$NETWORK_NAME \
--dataDir=$DATA_DIR/node-0 \
createTestnet \
@ -37,7 +37,7 @@ regenTestnetFiles() {
--totalValidators=$VALIDATOR_COUNT \
--lastUserValidator=$LAST_USER_VALIDATOR \
--outputGenesis=$NETWORK_DIR/genesis.json \
--outputNetwork=$NETWORK_DIR/$NETWORK_FLAVOUR-network.json \
--outputNetwork=$NETWORK_DIR/$NETWORK_TYPE-network.json \
--bootstrapAddress=$PUBLIC_IP \
--bootstrapPort=$BOOTSTRAP_PORT \
--genesisOffset=600 # Delay in seconds

View File

@ -1,4 +1,5 @@
NETWORK_ID=10
NETWORK_TYPE=rlpx
SHARD_COUNT=16
SLOTS_PER_EPOCH=16
SECONDS_PER_SLOT=30

View File

@ -1,4 +1,5 @@
NETWORK_ID=20
NETWORK_TYPE=libp2p_spec
SHARD_COUNT=16
SLOTS_PER_EPOCH=16
SECONDS_PER_SLOT=30