chang MaintenanceSkipSlots value to 1

palletone · Dec 27, 2019 · 17de74c · 17de74c
1 parent ad70e72
commit 17de74c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/bdd/GasToken/init_gas_token.sh b/bdd/GasToken/init_gas_token.sh
@@ -23,7 +23,7 @@ if [ -e "$jsonFile" ]; then
     sed -i "s/\"gasToken\": \"PTN\"/\"gasToken\": \"$gasToken\"/g" $jsonFile
     sed -i 's/"mediator_interval": 3,/"mediator_interval": 2,/g' $jsonFile
     sed -i 's/"initialTimestamp": [0-9]*,/"initialTimestamp": 1566269000,/g' $jsonFile
-    sed -i 's/"maintenance_skip_slots": 2,/"maintenance_skip_slots": 0,/g' $jsonFile
+    sed -i 's/"maintenance_skip_slots": 1,/"maintenance_skip_slots": 0,/g' $jsonFile
 else
     #file not found, new file
     echo "no $jsonFile"

diff --git a/bdd/mediator-vote/init.sh b/bdd/mediator-vote/init.sh
@@ -23,7 +23,7 @@ if [ -e "$jsonFile" ]; then
     sed -i "s/\"initial_active_mediators\": 5/\"initial_active_mediators\": 3/g" $jsonFile
     sed -i "s/\"min_mediator_count\": 5/\"min_mediator_count\": 3/g" $jsonFile
     sed -i "s/\"maintenance_interval\": [0-9]*/\"maintenance_interval\": 150/g" $jsonFile
-    sed -i "s/\"maintenance_skip_slots\": 2/\"maintenance_skip_slots\": 0/g" $jsonFile
+    sed -i "s/\"maintenance_skip_slots\": 1/\"maintenance_skip_slots\": 0/g" $jsonFile
     sed -i "s/\"mediator_interval\": 3,/\"mediator_interval\": 2,/g" $jsonFile
     sed -i "s/\"initialTimestamp\": [0-9]*,/\"initialTimestamp\": 1566269000,/g" $jsonFile
 else

diff --git a/bdd/node/init.py b/bdd/node/init.py
@@ -19,8 +19,8 @@
 sleep(2)
 
 subprocess.call("sed -i 's/\"mediator_interval\": 3,/\"mediator_interval\": 2,/g' ptn-genesis.json",shell=True)
-subprocess.call("sed -i 's/\"maintenance_skip_slots\": 2,/\"maintenance_skip_slots\": 0,/g' ptn-genesis.json",shell=True)
-# subprocess.call("sed -i 's/\"min_maint_skip_slots\": 2,/\"min_maint_skip_slots\": 0,/g' ptn-genesis.json",shell=True)
+subprocess.call("sed -i 's/\"maintenance_skip_slots\": 1,/\"maintenance_skip_slots\": 0,/g' ptn-genesis.json",shell=True)
+# subprocess.call("sed -i 's/\"min_maint_skip_slots\": 0,/\"min_maint_skip_slots\": 0,/g' ptn-genesis.json",shell=True)
 subprocess.call("sed -i 's/\"initialTimestamp\": [0-9]*,/\"initialTimestamp\": 1566269000,/g' ptn-genesis.json",shell=True)
 subprocess.call("sed -i 's/\"contract_election_num\": 4,/\"contract_election_num\": 3,/g' ptn-genesis.json",shell=True)
 subprocess.call("grep 'mediator_interval' ptn-genesis.json",shell=True)

diff --git a/bdd/node/preset.sh b/bdd/node/preset.sh
@@ -58,7 +58,7 @@ sleep 1
 # sed -i 's/"mediatorInterval": 3,/"mediatorInterval": 2,/g' node1/ptn-genesis.json
 sed -i 's/"mediator_interval": 3,/"mediator_interval": 2,/g' node1/ptn-genesis.json
 sed -i 's/"initialTimestamp": [0-9]*,/"initialTimestamp": 1566269000,/g' node1/ptn-genesis.json
-sed -i 's/"maintenance_skip_slots": 2,/"maintenance_skip_slots": 0,/g' node1/ptn-genesis.json
+sed -i 's/"maintenance_skip_slots": 1,/"maintenance_skip_slots": 0,/g' node1/ptn-genesis.json
 ./start.sh
 sleep 1
 numcommand=`ps -ef|grep gptn |wc -l`

diff --git a/cmd/deployment/deploy.sh b/cmd/deployment/deploy.sh
@@ -62,9 +62,9 @@ function replacejson()
 
     add=`echo $add | jq ".immutableChainParameters.min_mediator_count = $length"`
 
-    add=`echo $add | jq ".initialParameters.maintenance_skip_slots = 2"`
+    add=`echo $add | jq ".initialParameters.maintenance_skip_slots = 1"`
 
-    # add=`echo $add | jq ".immutableChainParameters.min_maint_skip_slots = 2"`
+    # add=`echo $add | jq ".immutableChainParameters.min_maint_skip_slots = 0"`
 
     add=`echo $add | jq ".initialParameters.mediator_interval = 3"`
 
@@ -139,7 +139,8 @@ fi
 
 getJuryIp=`./gptn getJuryIp`
 tempinfo=`echo $getJuryIp | sed -n '$p'| awk '{print $NF}'`
-ip=`echo ${tempinfo///}`
+ip=`echo ${tempinfo//
+/}`
 
 LoopDeploy $n $ip;
 

diff --git a/examples/first-network/scripts/deploy.sh b/examples/first-network/scripts/deploy.sh
@@ -62,9 +62,9 @@ function replacejson()
 
     add=`echo $add | jq ".immutableChainParameters.min_mediator_count = $length"`
 
-    add=`echo $add | jq ".initialParameters.maintenance_skip_slots = 2"`
+    add=`echo $add | jq ".initialParameters.maintenance_skip_slots = 1"`
 
-    # add=`echo $add | jq ".immutableChainParameters.min_maint_skip_slots = 2"`
+    # add=`echo $add | jq ".immutableChainParameters.min_maint_skip_slots = 0"`
 
     add=`echo $add | jq ".initialParameters.mediator_interval = 3"`