From 9e368168fc4b9f60e1f36b3407aedcb40e97a4f7 Mon Sep 17 00:00:00 2001 From: meng Date: Sun, 13 Sep 2020 23:28:40 +0800 Subject: [PATCH] change okchain to okexchain --- client/keys/add_ledger_test.go | 2 +- client/keys/show_test.go | 2 +- crypto/keys/keybase_test.go | 6 +-- crypto/keys/lazy_keybase_test.go | 2 +- crypto/keys/types_test.go | 2 +- crypto/ledger_test.go | 68 +++++++++++++-------------- server/config/config_okchain.go | 4 +- server/start.go | 2 +- server/start_okchain.go | 10 ++-- server/util.go | 6 +-- types/address.go | 2 +- types/rest/rest_test.go | 2 +- x/bank/internal/types/msgs_test.go | 4 +- x/genutil/legacy/v036/migrate_test.go | 4 +- x/gov/types/codec.go | 10 ++-- x/slashing/client/cli/query.go | 2 +- x/slashing/types/expected_keepers.go | 2 +- x/slashing/types/msg_test.go | 2 +- 18 files changed, 66 insertions(+), 66 deletions(-) diff --git a/client/keys/add_ledger_test.go b/client/keys/add_ledger_test.go index 6e581d56fc85..86cce0670f0c 100644 --- a/client/keys/add_ledger_test.go +++ b/client/keys/add_ledger_test.go @@ -99,6 +99,6 @@ func Test_runAddCmdLedger(t *testing.T) { assert.Equal(t, "keyname1", key1.GetName()) assert.Equal(t, keys.TypeLedger, key1.GetType()) assert.Equal(t, - "okchainpub1addwnpepqd87l8xhcnrrtzxnkql7k55ph8fr9jarf4hn6udwukfprlalu8lgwxtwrat", + "okexchainpub1addwnpepqd87l8xhcnrrtzxnkql7k55ph8fr9jarf4hn6udwukfprlalu8lgwxtwrat", sdk.MustBech32ifyAccPub(key1.GetPubKey())) } diff --git a/client/keys/show_test.go b/client/keys/show_test.go index ea0e4e322edc..66d546c9fe11 100644 --- a/client/keys/show_test.go +++ b/client/keys/show_test.go @@ -24,7 +24,7 @@ func Test_multiSigKey_Properties(t *testing.T) { assert.Equal(t, "myMultisig", tmp.GetName()) assert.Equal(t, keys.TypeMulti, tmp.GetType()) assert.Equal(t, "D3923267FA8A3DD367BB768FA8BDC8FF7F89DA3F", tmp.GetPubKey().Address().String()) - assert.Equal(t, "okchain16wfryel63g7axeamw68630wglalcnk3ldcxdmm", tmp.GetAddress().String()) + assert.Equal(t, "okexchain16wfryel63g7axeamw68630wglalcnk3ldcxdmm", tmp.GetAddress().String()) } func Test_showKeysCmd(t *testing.T) { diff --git a/crypto/keys/keybase_test.go b/crypto/keys/keybase_test.go index 7893942e90b2..631fe77b922c 100644 --- a/crypto/keys/keybase_test.go +++ b/crypto/keys/keybase_test.go @@ -64,7 +64,7 @@ func TestCreateLedger(t *testing.T) { pubKey := ledger.GetPubKey() pk, err := sdk.Bech32ifyAccPub(pubKey) assert.NoError(t, err) - assert.Equal(t, "okchainpub1addwnpepqg94y3n0sdcg5w0vhjqgp6e2ux20hxpm2sdy59nnlcny76uc729fyquy75e", pk) + assert.Equal(t, "okexchainpub1addwnpepqg94y3n0sdcg5w0vhjqgp6e2ux20hxpm2sdy59nnlcny76uc729fyquy75e", pk) // Check that restoring the key gets the same results restoredKey, err := kb.Get("some_account") @@ -73,7 +73,7 @@ func TestCreateLedger(t *testing.T) { assert.Equal(t, TypeLedger, restoredKey.GetType()) pubKey = restoredKey.GetPubKey() pk, err = sdk.Bech32ifyAccPub(pubKey) - assert.Equal(t, "okchainpub1addwnpepqg94y3n0sdcg5w0vhjqgp6e2ux20hxpm2sdy59nnlcny76uc729fyquy75e", pk) + assert.Equal(t, "okexchainpub1addwnpepqg94y3n0sdcg5w0vhjqgp6e2ux20hxpm2sdy59nnlcny76uc729fyquy75e", pk) path, err := restoredKey.GetPath() assert.NoError(t, err) @@ -114,7 +114,7 @@ func TestKeyManagement(t *testing.T) { require.NotNil(t, err) _, err = cstore.GetByAddress(accAddr(i2)) require.NoError(t, err) - addr, err := sdk.AccAddressFromBech32("okchain1yq8lgssgxlx9smjhes6ryjasmqmd3ts2kwlceg") + addr, err := sdk.AccAddressFromBech32("okexchain1yq8lgssgxlx9smjhes6ryjasmqmd3ts2kwlceg") require.NoError(t, err) _, err = cstore.GetByAddress(addr) require.NotNil(t, err) diff --git a/crypto/keys/lazy_keybase_test.go b/crypto/keys/lazy_keybase_test.go index df2a3f92e4fd..0db821fd61cf 100644 --- a/crypto/keys/lazy_keybase_test.go +++ b/crypto/keys/lazy_keybase_test.go @@ -57,7 +57,7 @@ func TestLazyKeyManagement(t *testing.T) { require.NotNil(t, err) _, err = kb.GetByAddress(accAddr(i2)) require.NoError(t, err) - addr, err := sdk.AccAddressFromBech32("okchain1yq8lgssgxlx9smjhes6ryjasmqmd3ts2kwlceg") + addr, err := sdk.AccAddressFromBech32("okexchain1yq8lgssgxlx9smjhes6ryjasmqmd3ts2kwlceg") require.NoError(t, err) _, err = kb.GetByAddress(addr) require.NotNil(t, err) diff --git a/crypto/keys/types_test.go b/crypto/keys/types_test.go index 82149056713c..30164e531af6 100644 --- a/crypto/keys/types_test.go +++ b/crypto/keys/types_test.go @@ -23,7 +23,7 @@ func Test_writeReadLedgerInfo(t *testing.T) { assert.NoError(t, err) assert.Equal(t, "44'/996'/5'/0/1", path.String()) assert.Equal(t, - "okchainpub1addwnpepqddddqg2glc8x4fl7vxjlnr7p5a3czm5kcdp4239sg6yqdc4rc2r58vtd89", + "okexchainpub1addwnpepqddddqg2glc8x4fl7vxjlnr7p5a3czm5kcdp4239sg6yqdc4rc2r58vtd89", types.MustBech32ifyAccPub(lInfo.GetPubKey())) // Serialize and restore diff --git a/crypto/ledger_test.go b/crypto/ledger_test.go index 2e192e40b811..ddb5d046ddc9 100644 --- a/crypto/ledger_test.go +++ b/crypto/ledger_test.go @@ -34,26 +34,26 @@ func TestPublicKeyUnsafe(t *testing.T) { pubKeyAddr, err := sdk.Bech32ifyAccPub(priv.PubKey()) require.NoError(t, err) - require.Equal(t, "okchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", + require.Equal(t, "okexchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", pubKeyAddr, "Is your device using test mnemonic: %s ?", tests.TestMnemonic) addr := sdk.AccAddress(priv.PubKey().Address()).String() - require.Equal(t, "okchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", + require.Equal(t, "okexchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", addr, "Is your device using test mnemonic: %s ?", tests.TestMnemonic) } func TestPublicKeyUnsafeHDPath(t *testing.T) { expectedAnswers := []string{ - "okchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", - "okchainpub1addwnpepqdvr3cuk0yvr6nct8zf6l7pxtyxxgtnc8ncxjnjjs4z2j3s2xlffxja4pkf", - "okchainpub1addwnpepqwmkd5ng58gt8mpt3j5hekp5jnq2p7a55p7qut5tx9xdkyguqgvgjvxdxjq", - "okchainpub1addwnpepq0pk8w5se4p352jm0ga36mrdtxc62rwppthncs9h632xhvxlw8ft6ygdfvm", - "okchainpub1addwnpepq2e43ypcapx6d03rctews7qkjtcxkuav58dazkesrwe5nl77gucvspwql4x", - "okchainpub1addwnpepqdyarkhe2kh56l5j5kde55qq29mff5u49y0qsthww34ymffsps0jv4q9rnz", - "okchainpub1addwnpepqgtg3xaplrf8a79e6j09cxp0hwaq40yrfn90udwz09dwg50asacpceup5r3", - "okchainpub1addwnpepq2wvn84fky0chza9zrje6qkg34rr7fwwlan9npln7j5vay6w3uh9qvzctya", - "okchainpub1addwnpepqg4u7rz8uksafzdgjxvepssnxtn897ettdpkfqcn26ygh7gsp6fygl3nlzl", - "okchainpub1addwnpepqvesztxmxvh8t2hl5q6l0m3vgcd26dnuvsct6fptzt3sruflun255mjuhn3", + "okexchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", + "okexchainpub1addwnpepqdvr3cuk0yvr6nct8zf6l7pxtyxxgtnc8ncxjnjjs4z2j3s2xlffxja4pkf", + "okexchainpub1addwnpepqwmkd5ng58gt8mpt3j5hekp5jnq2p7a55p7qut5tx9xdkyguqgvgjvxdxjq", + "okexchainpub1addwnpepq0pk8w5se4p352jm0ga36mrdtxc62rwppthncs9h632xhvxlw8ft6ygdfvm", + "okexchainpub1addwnpepq2e43ypcapx6d03rctews7qkjtcxkuav58dazkesrwe5nl77gucvspwql4x", + "okexchainpub1addwnpepqdyarkhe2kh56l5j5kde55qq29mff5u49y0qsthww34ymffsps0jv4q9rnz", + "okexchainpub1addwnpepqgtg3xaplrf8a79e6j09cxp0hwaq40yrfn90udwz09dwg50asacpceup5r3", + "okexchainpub1addwnpepq2wvn84fky0chza9zrje6qkg34rr7fwwlan9npln7j5vay6w3uh9qvzctya", + "okexchainpub1addwnpepqg4u7rz8uksafzdgjxvepssnxtn897ettdpkfqcn26ygh7gsp6fygl3nlzl", + "okexchainpub1addwnpepqvesztxmxvh8t2hl5q6l0m3vgcd26dnuvsct6fptzt3sruflun255mjuhn3", } const numIters = 10 @@ -110,10 +110,10 @@ func TestPublicKeySafe(t *testing.T) { pubKeyAddr, err := sdk.Bech32ifyAccPub(priv.PubKey()) require.NoError(t, err) - require.Equal(t, "okchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", + require.Equal(t, "okexchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", pubKeyAddr, "Is your device using test mnemonic: %s ?", tests.TestMnemonic) - require.Equal(t, "okchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", + require.Equal(t, "okexchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", addr, "Is your device using test mnemonic: %s ?", tests.TestMnemonic) addr2 := sdk.AccAddress(priv.PubKey().Address()).String() @@ -122,29 +122,29 @@ func TestPublicKeySafe(t *testing.T) { func TestPublicKeyHDPath(t *testing.T) { expectedPubKeys := []string{ - "okchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", - "okchainpub1addwnpepqdvr3cuk0yvr6nct8zf6l7pxtyxxgtnc8ncxjnjjs4z2j3s2xlffxja4pkf", - "okchainpub1addwnpepqwmkd5ng58gt8mpt3j5hekp5jnq2p7a55p7qut5tx9xdkyguqgvgjvxdxjq", - "okchainpub1addwnpepq0pk8w5se4p352jm0ga36mrdtxc62rwppthncs9h632xhvxlw8ft6ygdfvm", - "okchainpub1addwnpepq2e43ypcapx6d03rctews7qkjtcxkuav58dazkesrwe5nl77gucvspwql4x", - "okchainpub1addwnpepqdyarkhe2kh56l5j5kde55qq29mff5u49y0qsthww34ymffsps0jv4q9rnz", - "okchainpub1addwnpepqgtg3xaplrf8a79e6j09cxp0hwaq40yrfn90udwz09dwg50asacpceup5r3", - "okchainpub1addwnpepq2wvn84fky0chza9zrje6qkg34rr7fwwlan9npln7j5vay6w3uh9qvzctya", - "okchainpub1addwnpepqg4u7rz8uksafzdgjxvepssnxtn897ettdpkfqcn26ygh7gsp6fygl3nlzl", - "okchainpub1addwnpepqvesztxmxvh8t2hl5q6l0m3vgcd26dnuvsct6fptzt3sruflun255mjuhn3", + "okexchainpub1addwnpepqgt2zq3j80ggkfd4arcv74euwu26z6j7myraw2v0cg0w8t8w72tzsw0zse0", + "okexchainpub1addwnpepqdvr3cuk0yvr6nct8zf6l7pxtyxxgtnc8ncxjnjjs4z2j3s2xlffxja4pkf", + "okexchainpub1addwnpepqwmkd5ng58gt8mpt3j5hekp5jnq2p7a55p7qut5tx9xdkyguqgvgjvxdxjq", + "okexchainpub1addwnpepq0pk8w5se4p352jm0ga36mrdtxc62rwppthncs9h632xhvxlw8ft6ygdfvm", + "okexchainpub1addwnpepq2e43ypcapx6d03rctews7qkjtcxkuav58dazkesrwe5nl77gucvspwql4x", + "okexchainpub1addwnpepqdyarkhe2kh56l5j5kde55qq29mff5u49y0qsthww34ymffsps0jv4q9rnz", + "okexchainpub1addwnpepqgtg3xaplrf8a79e6j09cxp0hwaq40yrfn90udwz09dwg50asacpceup5r3", + "okexchainpub1addwnpepq2wvn84fky0chza9zrje6qkg34rr7fwwlan9npln7j5vay6w3uh9qvzctya", + "okexchainpub1addwnpepqg4u7rz8uksafzdgjxvepssnxtn897ettdpkfqcn26ygh7gsp6fygl3nlzl", + "okexchainpub1addwnpepqvesztxmxvh8t2hl5q6l0m3vgcd26dnuvsct6fptzt3sruflun255mjuhn3", } expectedAddrs := []string{ - "okchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", - "okchain1kywusqu9t5ppe9nl2rq26tg0cnzwygdctmmz5q", - "okchain1w9jw7273g3n8l0fyjtmlxmqhrctcn2afnlv9a2", - "okchain1lpjkyd2esun6y3l6qkjt377szaszn7ndte9sl7", - "okchain1m4hehxcu4nnq48wh6wummhdqtsnatm2cu8nlvc", - "okchain1chkys65xeekky8rjsr492n9ghytqprm6n3a2nt", - "okchain166tecxhd52la8w33g4kvpnnhp33wdfy0v6uda7", - "okchain1u8nwm4vk3q025azsujfqxwnftzzffjhkm0l7kr", - "okchain1m79f2vy0xm756v7evs2dz9umkw4swfn7j3e2a9", - "okchain13aex5w5w3hyg6zyvfq367g7alu47nk25msf2pj", + "okexchain1sjjdwhadqgt4e4507ps54zwc3zvx9c5hfxtysq", + "okexchain1kywusqu9t5ppe9nl2rq26tg0cnzwygdctmmz5q", + "okexchain1w9jw7273g3n8l0fyjtmlxmqhrctcn2afnlv9a2", + "okexchain1lpjkyd2esun6y3l6qkjt377szaszn7ndte9sl7", + "okexchain1m4hehxcu4nnq48wh6wummhdqtsnatm2cu8nlvc", + "okexchain1chkys65xeekky8rjsr492n9ghytqprm6n3a2nt", + "okexchain166tecxhd52la8w33g4kvpnnhp33wdfy0v6uda7", + "okexchain1u8nwm4vk3q025azsujfqxwnftzzffjhkm0l7kr", + "okexchain1m79f2vy0xm756v7evs2dz9umkw4swfn7j3e2a9", + "okexchain13aex5w5w3hyg6zyvfq367g7alu47nk25msf2pj", } const numIters = 10 diff --git a/server/config/config_okchain.go b/server/config/config_okchain.go index 57d834ebd88d..3e18ec788e0e 100644 --- a/server/config/config_okchain.go +++ b/server/config/config_okchain.go @@ -10,7 +10,7 @@ const ( BackendOrmEngineTypeMysql = "mysql" ) -var defaultNodeHome = os.ExpandEnv("$HOME/.okchaind") +var defaultNodeHome = os.ExpandEnv("$HOME/.okexchaind") // SetNodeHome sets the root directory for all data. func SetNodeHome(home string) { @@ -39,7 +39,7 @@ type BackendOrmEngineInfo struct { // engine type should be sqlite3 or mysql EngineType string `json:"engine_type" mapstructure:"engine_type"` - // if engine_type is sqlite3, it should be a local path, e.g.) /Users/lingting.fu/.okchaind/data/sqlite3/backend.db + // if engine_type is sqlite3, it should be a local path, e.g.) /Users/lingting.fu/.okexchaind/data/sqlite3/backend.db // if engine_type is mysql, it should be "[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...¶mN=valueN]" ConnectStr string `json:"connect_str" mapstructure:"connect_str"` } diff --git a/server/start.go b/server/start.go index f3b32dedde6f..67194e42123b 100644 --- a/server/start.go +++ b/server/start.go @@ -90,7 +90,7 @@ which accepts a path for the resulting pprof file. registerRestServerFlags(cmd) - registerOkchainPluginFlags(cmd) + registerokexchainPluginFlags(cmd) // add support for all Tendermint-specific command line options tcmd.AddNodeFlags(cmd) return cmd diff --git a/server/start_okchain.go b/server/start_okchain.go index 1068b889465e..bd53b7048170 100644 --- a/server/start_okchain.go +++ b/server/start_okchain.go @@ -14,7 +14,7 @@ import ( cmn "github.com/tendermint/tendermint/libs/common" ) -// okchain full-node start flags +// okexchain full-node start flags const ( FlagListenAddr = "rest.laddr" FlagExternalListenAddr = "rest.external_laddr" @@ -107,7 +107,7 @@ func StopCmd(ctx *Context) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { f, err := os.Open(filepath.Join(ctx.Config.RootDir, "config", "pid")) if err != nil { - errStr := fmt.Sprintf("%s Please finish the process of okchaind through kill -2 pid to stop gracefully", err.Error()) + errStr := fmt.Sprintf("%s Please finish the process of okexchaind through kill -2 pid to stop gracefully", err.Error()) cmn.Exit(errStr) } defer f.Close() @@ -115,7 +115,7 @@ func StopCmd(ctx *Context) *cobra.Command { in.Scan() pid, err := strconv.Atoi(in.Text()) if err != nil { - errStr := fmt.Sprintf("%s Please finish the process of okchaind through kill -2 pid to stop gracefully", err.Error()) + errStr := fmt.Sprintf("%s Please finish the process of okexchaind through kill -2 pid to stop gracefully", err.Error()) cmn.Exit(errStr) } process, err := os.FindProcess(pid) @@ -152,8 +152,8 @@ func registerRestServerFlags(cmd *cobra.Command) *cobra.Command { return cmd } -// registerOkchainPluginFlags registers the flags required for rest server -func registerOkchainPluginFlags(cmd *cobra.Command) *cobra.Command { +// registerokexchainPluginFlags registers the flags required for rest server +func registerokexchainPluginFlags(cmd *cobra.Command) *cobra.Command { cmd.Flags().Bool(FlagBackendEnableBackend, backendConf.EnableBackend, "Enable the node's backend plugin") cmd.Flags().Bool(FlagBackendEnableMktCompute, backendConf.EnableMktCompute, "Enable kline and ticker calculating") cmd.Flags().Bool(FlagBackendLogSQL, backendConf.LogSQL, "Enable backend plugin logging sql feature") diff --git a/server/util.go b/server/util.go index cd1a0e39d476..53889fabb7db 100644 --- a/server/util.go +++ b/server/util.go @@ -59,7 +59,7 @@ func PersistentPreRunEFn(context *Context) func(*cobra.Command, []string) error if err != nil { return err } - // okchain + // okexchain output := os.Stdout if !config.LogStdout { output, err = os.OpenFile(config.LogFile, os.O_CREATE|os.O_RDWR|os.O_APPEND, 0666) @@ -115,13 +115,13 @@ func interceptLoadConfig() (conf *cfg.Config, err error) { } config.SetNodeHome(rootDir) - appConfigFilePath := filepath.Join(rootDir, "config/okchaind.toml") + appConfigFilePath := filepath.Join(rootDir, "config/okexchaind.toml") if _, err := os.Stat(appConfigFilePath); os.IsNotExist(err) { appConf, _ := config.ParseConfig() config.WriteConfigFile(appConfigFilePath, appConf) } - viper.SetConfigName("okchaind") + viper.SetConfigName("okexchaind") err = viper.MergeInConfig() return diff --git a/types/address.go b/types/address.go index 0d07d9633874..d151a7c0d300 100644 --- a/types/address.go +++ b/types/address.go @@ -32,7 +32,7 @@ const ( // AddrLen defines a valid address length AddrLen = 20 // Bech32PrefixAccAddr defines the Bech32 prefix of an account's address - Bech32MainPrefix = "okchain" + Bech32MainPrefix = "okexchain" // Atom in https://github.com/satoshilabs/slips/blob/master/slip-0044.md CoinType = 996 diff --git a/types/rest/rest_test.go b/types/rest/rest_test.go index d32db1d5a7a9..6d88b76d8639 100644 --- a/types/rest/rest_test.go +++ b/types/rest/rest_test.go @@ -22,7 +22,7 @@ import ( type mockResponseWriter struct{} func TestBaseReqValidateBasic(t *testing.T) { - fromAddr := "okchain1cq0sxam6x4l0sv9yz3a2vlqhdhvt2k6jfjzq0v" + fromAddr := "okexchain1cq0sxam6x4l0sv9yz3a2vlqhdhvt2k6jfjzq0v" tenstakes, err := types.ParseCoins("10stake") require.NoError(t, err) onestake, err := types.ParseDecCoins("1.0stake") diff --git a/x/bank/internal/types/msgs_test.go b/x/bank/internal/types/msgs_test.go index 15e5fedf9d6d..1c33e77d85c1 100644 --- a/x/bank/internal/types/msgs_test.go +++ b/x/bank/internal/types/msgs_test.go @@ -58,7 +58,7 @@ func TestMsgSendGetSignBytes(t *testing.T) { var msg = NewMsgSend(addr1, addr2, coins) res := msg.GetSignBytes() - expected := `{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"10.00000000","denom":"atom"}],"from_address":"okchain1d9h8qat5h0q7xg","to_address":"okchain1da6hgur4wss2fvsy"}}` + expected := `{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"10.00000000","denom":"atom"}],"from_address":"okexchain1d9h8qat5h0q7xg","to_address":"okexchain1da6hgur4wss2fvsy"}}` require.Equal(t, expected, string(res)) } @@ -224,7 +224,7 @@ func TestMsgMultiSendGetSignBytes(t *testing.T) { } res := msg.GetSignBytes() - expected := `{"type":"cosmos-sdk/MsgMultiSend","value":{"inputs":[{"address":"okchain1d9h8qat5h0q7xg","coins":[{"amount":"10.00000000","denom":"atom"}]}],"outputs":[{"address":"okchain1da6hgur4wss2fvsy","coins":[{"amount":"10.00000000","denom":"atom"}]}]}}` + expected := `{"type":"cosmos-sdk/MsgMultiSend","value":{"inputs":[{"address":"okexchain1d9h8qat5h0q7xg","coins":[{"amount":"10.00000000","denom":"atom"}]}],"outputs":[{"address":"okexchain1da6hgur4wss2fvsy","coins":[{"amount":"10.00000000","denom":"atom"}]}]}}` require.Equal(t, expected, string(res)) } diff --git a/x/genutil/legacy/v036/migrate_test.go b/x/genutil/legacy/v036/migrate_test.go index f494509f68c8..399d0a60edf5 100644 --- a/x/genutil/legacy/v036/migrate_test.go +++ b/x/genutil/legacy/v036/migrate_test.go @@ -15,7 +15,7 @@ var basic034Gov = []byte(` { "proposal_id": "1", "deposit": { - "depositor": "okchain1grgelyng2v6v3t8z87wu3sxgt9m5s03xw29fcw", + "depositor": "okexchain1grgelyng2v6v3t8z87wu3sxgt9m5s03xw29fcw", "proposal_id": "1", "amount": [ { @@ -30,7 +30,7 @@ var basic034Gov = []byte(` { "proposal_id": "1", "vote": { - "voter": "okchain1lktjhnzkpkz3ehrg8psvmwhafg56kfsskwlwat", + "voter": "okexchain1lktjhnzkpkz3ehrg8psvmwhafg56kfsskwlwat", "proposal_id": "1", "option": "Yes" } diff --git a/x/gov/types/codec.go b/x/gov/types/codec.go index a3549c9d97ac..9e33c1a69130 100644 --- a/x/gov/types/codec.go +++ b/x/gov/types/codec.go @@ -12,12 +12,12 @@ var ModuleCdc = codec.New() func RegisterCodec(cdc *codec.Codec) { cdc.RegisterInterface((*Content)(nil), nil) - cdc.RegisterConcrete(MsgSubmitProposal{}, "okchain/gov/MsgSubmitProposal", nil) - cdc.RegisterConcrete(MsgDeposit{}, "okchain/gov/MsgDeposit", nil) - cdc.RegisterConcrete(MsgVote{}, "okchain/gov/MsgVote", nil) + cdc.RegisterConcrete(MsgSubmitProposal{}, "okexchain/gov/MsgSubmitProposal", nil) + cdc.RegisterConcrete(MsgDeposit{}, "okexchain/gov/MsgDeposit", nil) + cdc.RegisterConcrete(MsgVote{}, "okexchain/gov/MsgVote", nil) - cdc.RegisterConcrete(TextProposal{}, "okchain/gov/TextProposal", nil) - cdc.RegisterConcrete(SoftwareUpgradeProposal{}, "okchain/gov/SoftwareUpgradeProposal", nil) + cdc.RegisterConcrete(TextProposal{}, "okexchain/gov/TextProposal", nil) + cdc.RegisterConcrete(SoftwareUpgradeProposal{}, "okexchain/gov/SoftwareUpgradeProposal", nil) } // RegisterProposalTypeCodec registers an external proposal content type defined diff --git a/x/slashing/client/cli/query.go b/x/slashing/client/cli/query.go index bc52d4004729..5e663edb024b 100644 --- a/x/slashing/client/cli/query.go +++ b/x/slashing/client/cli/query.go @@ -43,7 +43,7 @@ func GetCmdQuerySigningInfo(storeName string, cdc *codec.Codec) *cobra.Command { Short: "Query a validator's signing information", Long: strings.TrimSpace(`Use a validators' consensus public key to find the signing-info for that validator: -$ query slashing signing-info okchainvalconspub1zcjduepqfhvwcmt7p06fvdgexxhmz0l8c7sgswl7ulv7aulk364x4g5xsw7sr0k2g5 +$ query slashing signing-info okexchainvalconspub1zcjduepqfhvwcmt7p06fvdgexxhmz0l8c7sgswl7ulv7aulk364x4g5xsw7sr0k2g5 `), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/x/slashing/types/expected_keepers.go b/x/slashing/types/expected_keepers.go index bd4dc6701e53..86aab964998a 100644 --- a/x/slashing/types/expected_keepers.go +++ b/x/slashing/types/expected_keepers.go @@ -36,6 +36,6 @@ type StakingHooks interface { AfterValidatorRemoved(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator is deleted AfterValidatorBonded(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator is bonded - /* required by okchain */ + /* required by okexchain */ AfterValidatorDestroyed(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator is destroyed by tx } diff --git a/x/slashing/types/msg_test.go b/x/slashing/types/msg_test.go index 81f0bd9d18cb..7e070e0b8677 100644 --- a/x/slashing/types/msg_test.go +++ b/x/slashing/types/msg_test.go @@ -14,7 +14,7 @@ func TestMsgUnjailGetSignBytes(t *testing.T) { bytes := msg.GetSignBytes() require.Equal( t, - `{"type":"cosmos-sdk/MsgUnjail","value":{"address":"okchainvaloper1v93xxeqhet2kl"}}`, + `{"type":"cosmos-sdk/MsgUnjail","value":{"address":"okexchainvaloper1v93xxeqhet2kl"}}`, string(bytes), ) }