cmd: hyphen case cli and config (#5777)

This commit is contained in:
Callum Waters
2020-12-11 13:14:04 +01:00
committed by GitHub
parent c1be58a27b
commit 3283a84ab2
22 changed files with 306 additions and 274 deletions
+5 -5
View File
@@ -17,7 +17,7 @@ function kvstore_over_socket(){
echo "Starting kvstore_over_socket"
abci-cli kvstore > /dev/null &
pid_kvstore=$!
tendermint node > tendermint.log &
tendermint start > tendermint.log &
pid_tendermint=$!
sleep 5
@@ -32,7 +32,7 @@ function kvstore_over_socket_reorder(){
rm -rf $TMHOME
tendermint init
echo "Starting kvstore_over_socket_reorder (ie. start tendermint first)"
tendermint node > tendermint.log &
tendermint start > tendermint.log &
pid_tendermint=$!
sleep 2
abci-cli kvstore > /dev/null &
@@ -52,7 +52,7 @@ function counter_over_socket() {
echo "Starting counter_over_socket"
abci-cli counter --serial > /dev/null &
pid_counter=$!
tendermint node > tendermint.log &
tendermint start > tendermint.log &
pid_tendermint=$!
sleep 5
@@ -68,7 +68,7 @@ function counter_over_grpc() {
echo "Starting counter_over_grpc"
abci-cli counter --serial --abci grpc > /dev/null &
pid_counter=$!
tendermint node --abci grpc > tendermint.log &
tendermint start --abci grpc > tendermint.log &
pid_tendermint=$!
sleep 5
@@ -86,7 +86,7 @@ function counter_over_grpc_grpc() {
pid_counter=$!
sleep 1
GRPC_PORT=36656
tendermint node --abci grpc --rpc.grpc_laddr tcp://localhost:$GRPC_PORT > tendermint.log &
tendermint start --abci grpc --rpc.grpc-laddr tcp://localhost:$GRPC_PORT > tendermint.log &
pid_tendermint=$!
sleep 5
+1 -1
View File
@@ -29,5 +29,5 @@ ENV TMHOME=/tendermint
EXPOSE 26656 26657 26660
ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["node"]
CMD ["start"]
STOPSIGNAL SIGTERM
+3 -3
View File
@@ -159,7 +159,7 @@ services:
entrypoint: /usr/bin/entrypoint-builtin
{{- else if .Misbehaviors }}
entrypoint: /usr/bin/entrypoint-maverick
command: ["node", "--misbehaviors", "{{ misbehaviorsToString .Misbehaviors }}"]
command: ["start", "--misbehaviors", "{{ misbehaviorsToString .Misbehaviors }}"]
{{- end }}
init: true
ports:
@@ -392,7 +392,7 @@ func UpdateConfigStateSync(node *e2e.Node, height int64, hash []byte) error {
if err != nil {
return err
}
bz = regexp.MustCompile(`(?m)^trust_height =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust_height = %v`, height)))
bz = regexp.MustCompile(`(?m)^trust_hash =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust_hash = "%X"`, hash)))
bz = regexp.MustCompile(`(?m)^trust-height =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust-height = %v`, height)))
bz = regexp.MustCompile(`(?m)^trust-hash =.*`).ReplaceAll(bz, []byte(fmt.Sprintf(`trust-hash = "%X"`, hash)))
return ioutil.WriteFile(cfgPath, bz, 0644)
}
+3 -2
View File
@@ -100,8 +100,9 @@ func main() {
)
nodeCmd := &cobra.Command{
Use: "node",
Short: "Run the maverick node",
Use: "start",
Aliases: []string{"node", "run"},
Short: "Run the maverick node",
RunE: func(command *cobra.Command, args []string) error {
return startNode(config, logger, misbehaviorFlag)
},