From f492aedf2b522108d6514fc8ef5c0fcd2e04d139 Mon Sep 17 00:00:00 2001 From: HaoyangLiu Date: Mon, 19 Nov 2018 10:37:21 +0800 Subject: [PATCH] Add InitBech32Prefix function --- cmd/iris/main.go | 11 ++--------- cmd/iriscli/main.go | 9 ++------- cmd/irisdebug/main.go | 7 ++----- cmd/irislcd/main.go | 7 +------ cmd/irismon/main.go | 14 ++++---------- init/prefix.go | 14 +++++++++++++- 6 files changed, 24 insertions(+), 38 deletions(-) diff --git a/cmd/iris/main.go b/cmd/iris/main.go index abf7a6700..ef9a9255a 100644 --- a/cmd/iris/main.go +++ b/cmd/iris/main.go @@ -4,16 +4,13 @@ import ( "encoding/json" "io" - "github.com/spf13/cobra" - "github.com/cosmos/cosmos-sdk/server" "github.com/irisnet/irishub/app" bam "github.com/irisnet/irishub/baseapp" "github.com/irisnet/irishub/client" - - sdk "github.com/cosmos/cosmos-sdk/types" irisInit "github.com/irisnet/irishub/init" "github.com/irisnet/irishub/version" + "github.com/spf13/cobra" "github.com/spf13/viper" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/libs/cli" @@ -24,11 +21,7 @@ import ( func main() { - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub) - config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub) - config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub) - config.Seal() + irisInit.InitBech32Prefix() cdc := app.MakeCodec() ctx := server.NewDefaultContext() diff --git a/cmd/iriscli/main.go b/cmd/iriscli/main.go index 7e520a805..cd1f1027a 100644 --- a/cmd/iriscli/main.go +++ b/cmd/iriscli/main.go @@ -4,16 +4,15 @@ import ( "os" "path" - sdk "github.com/cosmos/cosmos-sdk/types" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" "github.com/irisnet/irishub/app" "github.com/irisnet/irishub/client" bankcmd "github.com/irisnet/irishub/client/bank/cli" distributioncmd "github.com/irisnet/irishub/client/distribution/cli" govcmd "github.com/irisnet/irishub/client/gov/cli" - servicecmd "github.com/irisnet/irishub/client/service/cli" keyscmd "github.com/irisnet/irishub/client/keys/cli" recordcmd "github.com/irisnet/irishub/client/record/cli" + servicecmd "github.com/irisnet/irishub/client/service/cli" slashingcmd "github.com/irisnet/irishub/client/slashing/cli" stakecmd "github.com/irisnet/irishub/client/stake/cli" tendermintrpccmd "github.com/irisnet/irishub/client/tendermint/rpc" @@ -36,11 +35,7 @@ var ( func main() { - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub) - config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub) - config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub) - config.Seal() + irisInit.InitBech32Prefix() cobra.EnableCommandSorting = false cdc := app.MakeCodec() diff --git a/cmd/irisdebug/main.go b/cmd/irisdebug/main.go index fbccde2aa..d7ddd0e44 100644 --- a/cmd/irisdebug/main.go +++ b/cmd/irisdebug/main.go @@ -20,11 +20,8 @@ import ( ) func init() { - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub) - config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub) - config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub) - config.Seal() + + irisInit.InitBech32Prefix() rootCmd.AddCommand(txCmd) rootCmd.AddCommand(pubkeyCmd) diff --git a/cmd/irislcd/main.go b/cmd/irislcd/main.go index 7116f8668..bdd7b8dd2 100644 --- a/cmd/irislcd/main.go +++ b/cmd/irislcd/main.go @@ -1,7 +1,6 @@ package main import ( - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/irisnet/irishub/app" "github.com/irisnet/irishub/client/lcd" _ "github.com/irisnet/irishub/client/lcd/statik" @@ -21,11 +20,7 @@ var ( func main() { - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub) - config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub) - config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub) - config.Seal() + irisInit.InitBech32Prefix() cobra.EnableCommandSorting = false cdc := app.MakeCodec() diff --git a/cmd/irismon/main.go b/cmd/irismon/main.go index ef107d937..7ff97e0e0 100644 --- a/cmd/irismon/main.go +++ b/cmd/irismon/main.go @@ -1,14 +1,13 @@ package main import ( + "os" + "github.com/irisnet/irishub/app" + irisInit "github.com/irisnet/irishub/init" "github.com/irisnet/irishub/tools/prometheus" "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" - "os" - - sdk "github.com/cosmos/cosmos-sdk/types" - irisInit "github.com/irisnet/irishub/init" ) func init() { @@ -21,12 +20,7 @@ func init() { var rootCmd *cobra.Command func main() { - config := sdk.GetConfig() - config.SetBech32PrefixForAccount(irisInit.Bech32PrefixAccAddr, irisInit.Bech32PrefixAccPub) - config.SetBech32PrefixForValidator(irisInit.Bech32PrefixValAddr, irisInit.Bech32PrefixValPub) - config.SetBech32PrefixForConsensusNode(irisInit.Bech32PrefixConsAddr, irisInit.Bech32PrefixConsPub) - config.Seal() - + irisInit.InitBech32Prefix() executor := cli.PrepareMainCmd(rootCmd, "IRIS", app.DefaultNodeHome) err := executor.Execute() if err != nil { diff --git a/init/prefix.go b/init/prefix.go index 3864afdd7..36d02ca92 100644 --- a/init/prefix.go +++ b/init/prefix.go @@ -1,5 +1,9 @@ package init +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + const ( // Bech32PrefixAccAddr defines the Bech32 prefix of an account's address Bech32PrefixAccAddr = "faa" @@ -13,4 +17,12 @@ const ( Bech32PrefixConsAddr = "fca" // Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key Bech32PrefixConsPub = "fcp" -) \ No newline at end of file +) + +func InitBech32Prefix() { + config := sdk.GetConfig() + config.SetBech32PrefixForAccount(Bech32PrefixAccAddr, Bech32PrefixAccPub) + config.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub) + config.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub) + config.Seal() +}