Skip to content

P
plugin
Commit b9bfbf4e authored by vipwzw's avatar vipwzw
Browse files
Options

auto ci

parent 7f74c396
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 14 deletions
plugin/consensus/dpos/consensus_state.go
View file @ b9bfbf4e
...@@ -165,7 +165,7 @@ func (cs *ConsensusState) GetValidatorMgr() ValidatorMgr { ...@@ -165,7 +165,7 @@ func (cs *ConsensusState) GetValidatorMgr() ValidatorMgr {
} }
// GetPrivValidator returns the pointer of PrivValidator // GetPrivValidator returns the pointer of PrivValidator
func (cs *ConsensusState) GetPrivValidator() ttypes.PrivValidator{ func (cs *ConsensusState) GetPrivValidator() ttypes.PrivValidator {
return cs.privValidator return cs.privValidator
} }
......
plugin/consensus/dpos/dpos.go
View file @ b9bfbf4e
...@@ -760,6 +760,6 @@ func printCandidators(cands []*dty.Candidator) string { ...@@ -760,6 +760,6 @@ func printCandidators(cands []*dty.Candidator) string {
} }
// GetConsensusState return the pointer to ConsensusState // GetConsensusState return the pointer to ConsensusState
func (client *Client)GetConsensusState() *ConsensusState { func (client *Client) GetConsensusState() *ConsensusState {
return client.csState return client.csState
} }
plugin/dapp/dposvote/commands/vote_test.go
View file @ b9bfbf4e
...@@ -8,14 +8,13 @@ import ( ...@@ -8,14 +8,13 @@ import (
"flag" "flag"
"fmt" "fmt"
"github.com/spf13/cobra"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"
"testing" "testing"
"time" "time"
"github.com/spf13/cobra"
"github.com/33cn/chain33/blockchain" "github.com/33cn/chain33/blockchain"
"github.com/33cn/chain33/common/address" "github.com/33cn/chain33/common/address"
...@@ -72,7 +71,6 @@ func init() { ...@@ -72,7 +71,6 @@ func init() {
os.Remove("genesis_file.json") os.Remove("genesis_file.json")
os.Remove("priv_validator_0.json") os.Remove("priv_validator_0.json")
ioutil.WriteFile("genesis.json", []byte(genesis), 0664) ioutil.WriteFile("genesis.json", []byte(genesis), 0664)
ioutil.WriteFile("priv_validator.json", []byte(priv), 0664) ioutil.WriteFile("priv_validator.json", []byte(priv), 0664)
} }
...@@ -239,31 +237,31 @@ func testCmd(cmd *cobra.Command) { ...@@ -239,31 +237,31 @@ func testCmd(cmd *cobra.Command) {
rootCmd.PersistentFlags().String("rpc_laddr", "http://127.0.0.1:8802", "http url") rootCmd.PersistentFlags().String("rpc_laddr", "http://127.0.0.1:8802", "http url")
rootCmd.AddCommand(cmd) rootCmd.AddCommand(cmd)
rootCmd.SetArgs([]string{"dpos", "regist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--ip", "127.0.0.1", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"dpos", "regist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--ip", "127.0.0.1", "--rpc_laddr", "http://127.0.0.1:8801"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "cancelRegist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"dpos", "cancelRegist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--rpc_laddr", "http://127.0.0.1:8801"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "reRegist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--ip", "127.0.0.1", "--rpc_laddr", "http://127.0.0.1:8801"}) rootCmd.SetArgs([]string{"dpos", "reRegist", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--ip", "127.0.0.1", "--rpc_laddr", "http://127.0.0.1:8801"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "candidatorQuery", "--type", "topN", "--top","1"}) rootCmd.SetArgs([]string{"dpos", "candidatorQuery", "--type", "topN", "--top", "1"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "candidatorQuery", "--type", "pubkeys", "--pubkeys","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"}) rootCmd.SetArgs([]string{"dpos", "candidatorQuery", "--type", "pubkeys", "--pubkeys", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "voteQuery", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkeys","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"}) rootCmd.SetArgs([]string{"dpos", "voteQuery", "--address", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkeys", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "vote", "--addr", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--votes", "60"}) rootCmd.SetArgs([]string{"dpos", "vote", "--addr", "15LsTP6tkYGZcN7tc1Xo2iYifQfowxot3b", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--votes", "60"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "init_keyfile", "--num", "1"}) rootCmd.SetArgs([]string{"dpos", "init_keyfile", "--num", "1"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "cbRecord", "--cycle", "1000", "--hash","03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--height", "60", "--privKey", "5A6A14DA6F5A42835E529D75D87CC8904544F59EEE5387A37D87EEAD194D7EB2"}) rootCmd.SetArgs([]string{"dpos", "cbRecord", "--cycle", "1000", "--hash", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4", "--height", "60", "--privKey", "5A6A14DA6F5A42835E529D75D87CC8904544F59EEE5387A37D87EEAD194D7EB2"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "cbQuery", "--type", "cycle", "--cycle", "1000"}) rootCmd.SetArgs([]string{"dpos", "cbQuery", "--type", "cycle", "--cycle", "1000"})
...@@ -278,7 +276,7 @@ func testCmd(cmd *cobra.Command) { ...@@ -278,7 +276,7 @@ func testCmd(cmd *cobra.Command) {
rootCmd.SetArgs([]string{"dpos", "vrfMRegist", "--cycle", "1000", "--m", "data1", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"}) rootCmd.SetArgs([]string{"dpos", "vrfMRegist", "--cycle", "1000", "--m", "data1", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "vrfRPRegist", "--cycle", "1000", "--hash", "22a58fbbe8002939b7818184e663e6c57447f4354adba31ad3c7f556e153353c","--proof", "5ed22d8c1cc0ad131c1c9f82daec7b99ff25ae5e717624b4a8cf60e0f3dca2c97096680cd8df0d9ed8662ce6513edf5d1676ad8d72b7e4f0e0de687bd38623f404eb085d28f5631207cf97a02c55f835bd3733241c7e068b80cf75e2afd12fd4c4cb8e6f630afa2b7b2918dff3d279e50acab59da1b25b3ff920b69c443da67320", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"}) rootCmd.SetArgs([]string{"dpos", "vrfRPRegist", "--cycle", "1000", "--hash", "22a58fbbe8002939b7818184e663e6c57447f4354adba31ad3c7f556e153353c", "--proof", "5ed22d8c1cc0ad131c1c9f82daec7b99ff25ae5e717624b4a8cf60e0f3dca2c97096680cd8df0d9ed8662ce6513edf5d1676ad8d72b7e4f0e0de687bd38623f404eb085d28f5631207cf97a02c55f835bd3733241c7e068b80cf75e2afd12fd4c4cb8e6f630afa2b7b2918dff3d279e50acab59da1b25b3ff920b69c443da67320", "--pubkey", "03EF0E1D3112CF571743A3318125EDE2E52A4EB904BCBAA4B1F75020C2846A7EB4"})
rootCmd.Execute() rootCmd.Execute()
rootCmd.SetArgs([]string{"dpos", "vrfQuery", "--type", "dtime", "--time", "2006-01-02 15:04:05"}) rootCmd.SetArgs([]string{"dpos", "vrfQuery", "--type", "dtime", "--time", "2006-01-02 15:04:05"})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment