Skip to content

P
plugin
Unverified Commit 33922ee8 authored by vipwzw's avatar vipwzw Committed by GitHub
Browse files
Options

Merge pull request #79 from kongmingbo/misspell_warning

fix misspell warning
parents 19bca53e 23208459
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 73 deletions
golinter.sh
View file @ 33922ee8
...@@ -15,6 +15,7 @@ function filterLinter() { ...@@ -15,6 +15,7 @@ function filterLinter() {
--enable=varcheck \ --enable=varcheck \
--enable=structcheck \ --enable=structcheck \
--enable=goimports \ --enable=goimports \
--enable=misspell \
--vendor ./...) --vendor ./...)
# --enable=staticcheck \ # --enable=staticcheck \
# --enable=gocyclo \ # --enable=gocyclo \
......
plugin/consensus/pbft/pbft_test.go
View file @ 33922ee8
...@@ -148,5 +148,5 @@ func clearTestData() { ...@@ -148,5 +148,5 @@ func clearTestData() {
if err != nil { if err != nil {
fmt.Println("delete wallet have a err:", err.Error()) fmt.Println("delete wallet have a err:", err.Error())
} }
fmt.Println("test data clear sucessfully!") fmt.Println("test data clear successfully!")
} }
plugin/consensus/raft/raft_test.go
View file @ 33922ee8
...@@ -175,5 +175,5 @@ func clearTestData() { ...@@ -175,5 +175,5 @@ func clearTestData() {
if err != nil { if err != nil {
fmt.Println("delete chain33_raft dir have a err:", err.Error()) fmt.Println("delete chain33_raft dir have a err:", err.Error())
} }
fmt.Println("test data clear sucessfully!") fmt.Println("test data clear successfully!")
} }
plugin/consensus/raft/tools/scripts/go-scp/scp.go
View file @ 33922ee8
...@@ -181,7 +181,7 @@ func remoteScp(si *ScpInfo, reqnum chan struct{}) { ...@@ -181,7 +181,7 @@ func remoteScp(si *ScpInfo, reqnum chan struct{}) {
}() }()
ScpFileFromLocalToRemote(si) ScpFileFromLocalToRemote(si)
//session, err := sshconnect("ubuntu", "Fuzamei#123456", "raft15258.chinacloudapp.cn", 22) //session, err := sshconnect("ubuntu", "Fuzamei#123456", "raft15258.chinacloudapp.cn", 22)
fmt.Println("remoteScp file sucessfully!:") fmt.Println("remoteScp file successfully!:")
} }
......
plugin/consensus/tendermint/node.go
View file @ 33922ee8
...@@ -396,7 +396,7 @@ func (node *Node) stopAndRemovePeer(peer Peer, reason interface{}) { ...@@ -396,7 +396,7 @@ func (node *Node) stopAndRemovePeer(peer Peer, reason interface{}) {
peer.Stop() peer.Stop()
} }
// StopPeerForError called if error occured // StopPeerForError called if error occurred
func (node *Node) StopPeerForError(peer Peer, reason interface{}) { func (node *Node) StopPeerForError(peer Peer, reason interface{}) {
tendermintlog.Error("Stopping peer for error", "peer", peer, "err", reason) tendermintlog.Error("Stopping peer for error", "peer", peer, "err", reason)
addr, err := peer.RemoteAddr() addr, err := peer.RemoteAddr()
......
plugin/consensus/tendermint/tendermint_test.go
View file @ 33922ee8
...@@ -161,7 +161,7 @@ func clearTestData() { ...@@ -161,7 +161,7 @@ func clearTestData() {
if err != nil { if err != nil {
fmt.Println("delete datadir have a err:", err.Error()) fmt.Println("delete datadir have a err:", err.Error())
} }
fmt.Println("test data clear sucessfully!") fmt.Println("test data clear successfully!")
} }
func NormPut() { func NormPut() {
......
plugin/dapp/blackwhite/executor/action.go
View file @ 33922ee8
...@@ -528,26 +528,26 @@ func (a *action) getWinner(round *gt.BlackwhiteRound) ([]*addrResult, *gt.ReplyL ...@@ -528,26 +528,26 @@ func (a *action) getWinner(round *gt.BlackwhiteRound) ([]*addrResult, *gt.ReplyL
addrRes := round.AddrResult addrRes := round.AddrResult
loop := int(round.Loop) loop := int(round.Loop)
for _, addres := range addrRes { for _, address := range addrRes {
if len(addres.ShowSecret) > 0 && len(addres.HashValues) == loop { if len(address.ShowSecret) > 0 && len(address.HashValues) == loop {
var isBlack []bool var isBlack []bool
// 加入分叉高度判断：分叉高度在ForkV25BlackWhite到ForkV25BlackWhiteV2之间的执行原来逻辑，大于ForkV25BlackWhiteV2执行新逻辑， // 加入分叉高度判断：分叉高度在ForkV25BlackWhite到ForkV25BlackWhiteV2之间的执行原来逻辑，大于ForkV25BlackWhiteV2执行新逻辑，
// 小于ForkV25BlackWhite则无法进入 // 小于ForkV25BlackWhite则无法进入
if !types.IsDappFork(a.height, gt.BlackwhiteX, "ForkBlackWhiteV2") { if !types.IsDappFork(a.height, gt.BlackwhiteX, "ForkBlackWhiteV2") {
for _, hash := range addres.HashValues { for _, hash := range address.HashValues {
if bytes.Equal(common.Sha256([]byte(addres.ShowSecret+black)), hash) { if bytes.Equal(common.Sha256([]byte(address.ShowSecret+black)), hash) {
isBlack = append(isBlack, true) isBlack = append(isBlack, true)
} else if bytes.Equal(common.Sha256([]byte(addres.ShowSecret+white)), hash) { } else if bytes.Equal(common.Sha256([]byte(address.ShowSecret+white)), hash) {
isBlack = append(isBlack, false) isBlack = append(isBlack, false)
} else { } else {
isBlack = append(isBlack, false) isBlack = append(isBlack, false)
} }
} }
} else { } else {
for i, hash := range addres.HashValues { for i, hash := range address.HashValues {
if bytes.Equal(common.Sha256([]byte(strconv.Itoa(i)+addres.ShowSecret+black)), hash) { if bytes.Equal(common.Sha256([]byte(strconv.Itoa(i)+address.ShowSecret+black)), hash) {
isBlack = append(isBlack, true) isBlack = append(isBlack, true)
} else if bytes.Equal(common.Sha256([]byte(strconv.Itoa(i)+addres.ShowSecret+white)), hash) { } else if bytes.Equal(common.Sha256([]byte(strconv.Itoa(i)+address.ShowSecret+white)), hash) {
isBlack = append(isBlack, false) isBlack = append(isBlack, false)
} else { } else {
isBlack = append(isBlack, false) isBlack = append(isBlack, false)
...@@ -555,8 +555,8 @@ func (a *action) getWinner(round *gt.BlackwhiteRound) ([]*addrResult, *gt.ReplyL ...@@ -555,8 +555,8 @@ func (a *action) getWinner(round *gt.BlackwhiteRound) ([]*addrResult, *gt.ReplyL
} }
} }
addresX := &resultCalc{ addresX := &resultCalc{
Addr: addres.Addr, Addr: address.Addr,
amount: addres.Amount, amount: address.Amount,
IsWin: true, IsWin: true,
IsBlack: isBlack, IsBlack: isBlack,
} }
......
plugin/dapp/blackwhite/executor/action_test.go
View file @ 33922ee8
...@@ -217,7 +217,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -217,7 +217,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
Loop: 4, Loop: 4,
} }
addres := &gt.AddressResult{ address := &gt.AddressResult{
Addr: "1", Addr: "1",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -225,9 +225,9 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -225,9 +225,9 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))}, common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
addres = &gt.AddressResult{ address = &gt.AddressResult{
Addr: "2", Addr: "2",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -235,9 +235,9 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -235,9 +235,9 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))}, common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
addres = &gt.AddressResult{ address = &gt.AddressResult{
Addr: "3", Addr: "3",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -245,7 +245,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -245,7 +245,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(3) + showSecret + black))}, common.Sha256([]byte(strconv.Itoa(3) + showSecret + black))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
round.AddrResult = addrRes round.AddrResult = addrRes
...@@ -257,7 +257,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -257,7 +257,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
//t.Logf("winers1 is %v", winers) //t.Logf("winers1 is %v", winers)
//t.Logf("losers1 is %v", losers) //t.Logf("losers1 is %v", losers)
addres = &gt.AddressResult{ address = &gt.AddressResult{
Addr: "4", Addr: "4",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -265,9 +265,9 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -265,9 +265,9 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(3) + showSecret + black))}, common.Sha256([]byte(strconv.Itoa(3) + showSecret + black))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
addres = &gt.AddressResult{ address = &gt.AddressResult{
Addr: "5", Addr: "5",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -275,7 +275,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -275,7 +275,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))}, common.Sha256([]byte(strconv.Itoa(3) + showSecret + white))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
round.AddrResult = addrRes round.AddrResult = addrRes
...@@ -286,7 +286,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -286,7 +286,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
//t.Logf("winers2 is %v", winers) //t.Logf("winers2 is %v", winers)
//t.Logf("losers2 is %v", losers) //t.Logf("losers2 is %v", losers)
addres = &gt.AddressResult{ address = &gt.AddressResult{
Addr: "6", Addr: "6",
HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)), HashValues: [][]byte{common.Sha256([]byte(strconv.Itoa(0) + showSecret + black)),
common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)), common.Sha256([]byte(strconv.Itoa(1) + showSecret + white)),
...@@ -298,7 +298,7 @@ func Test_getWinnerAndLoser(t *testing.T) { ...@@ -298,7 +298,7 @@ func Test_getWinnerAndLoser(t *testing.T) {
common.Sha256([]byte(strconv.Itoa(7) + showSecret + white))}, common.Sha256([]byte(strconv.Itoa(7) + showSecret + white))},
ShowSecret: showSecret, ShowSecret: showSecret,
} }
addrRes = append(addrRes, addres) addrRes = append(addrRes, address)
round.AddrResult = addrRes round.AddrResult = addrRes
......
plugin/dapp/blackwhite/types/types.go
View file @ 33922ee8
...@@ -67,7 +67,7 @@ func (b BlackwhiteType) ActionName(tx *types.Transaction) string { ...@@ -67,7 +67,7 @@ func (b BlackwhiteType) ActionName(tx *types.Transaction) string {
var g BlackwhiteAction var g BlackwhiteAction
err := types.Decode(tx.Payload, &g) err := types.Decode(tx.Payload, &g)
if err != nil { if err != nil {
return "unkown-Blackwhite-action-err" return "unknown-Blackwhite-action-err"
} }
if g.Ty == BlackwhiteActionCreate && g.GetCreate() != nil { if g.Ty == BlackwhiteActionCreate && g.GetCreate() != nil {
return "BlackwhiteCreate" return "BlackwhiteCreate"
...@@ -78,7 +78,7 @@ func (b BlackwhiteType) ActionName(tx *types.Transaction) string { ...@@ -78,7 +78,7 @@ func (b BlackwhiteType) ActionName(tx *types.Transaction) string {
} else if g.Ty == BlackwhiteActionTimeoutDone && g.GetTimeoutDone() != nil { } else if g.Ty == BlackwhiteActionTimeoutDone && g.GetTimeoutDone() != nil {
return "BlackwhiteTimeoutDone" return "BlackwhiteTimeoutDone"
} }
return "unkown" return "unknown"
} }
// Amount ... // Amount ...
......
plugin/dapp/evm/executor/tests/evm_test.go
View file @ 33922ee8
...@@ -106,7 +106,7 @@ func runDir(tt *testing.T, basePath string) { ...@@ -106,7 +106,7 @@ func runDir(tt *testing.T, basePath string) {
} }
func runCase(tt *testing.T, c VMCase, file string) { func runCase(tt *testing.T, c VMCase, file string) {
tt.Logf("runing test case:%s in file:%s", c.name, file) tt.Logf("running test case:%s in file:%s", c.name, file)
// 1 构建预置环境 pre // 1 构建预置环境 pre
inst := evm.NewEVMExecutor() inst := evm.NewEVMExecutor()
......
plugin/dapp/hashlock/executor/hashlock_test.go
View file @ 33922ee8
...@@ -188,7 +188,7 @@ func estHashlock(t *testing.T) { ...@@ -188,7 +188,7 @@ func estHashlock(t *testing.T) {
func estHashunlock(t *testing.T) { func estHashunlock(t *testing.T) {
fmt.Println("TestHashunlock start") fmt.Println("TestHashunlock start")
defer fmt.Println("TestHashunlock end") defer fmt.Println("TestHashunlock end")
//not sucess as time not enough //not success as time not enough
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
err := unlock(secret) err := unlock(secret)
if err != nil { if err != nil {
......
plugin/dapp/hashlock/proto/hashlock.proto
View file @ 33922ee8
...@@ -33,8 +33,8 @@ message Hashlockquery { ...@@ -33,8 +33,8 @@ message Hashlockquery {
} }
message HashRecv { message HashRecv {
bytes HashlockId = 1; bytes HashlockId = 1;
Hashlockquery Infomation = 2; Hashlockquery Information = 2;
} }
message HashlockUnlock { message HashlockUnlock {
......
plugin/dapp/hashlock/types/hashlock.pb.go
View file @ 33922ee8
...@@ -291,7 +291,7 @@ func (m *Hashlockquery) GetCurrentTime() int64 { ...@@ -291,7 +291,7 @@ func (m *Hashlockquery) GetCurrentTime() int64 {
type HashRecv struct { type HashRecv struct {
HashlockId []byte `protobuf:"bytes,1,opt,name=HashlockId,proto3" json:"HashlockId,omitempty"` HashlockId []byte `protobuf:"bytes,1,opt,name=HashlockId,proto3" json:"HashlockId,omitempty"`
Infomation *Hashlockquery `protobuf:"bytes,2,opt,name=Infomation,proto3" json:"Infomation,omitempty"` Information *Hashlockquery `protobuf:"bytes,2,opt,name=Information,proto3" json:"Information,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -329,9 +329,9 @@ func (m *HashRecv) GetHashlockId() []byte { ...@@ -329,9 +329,9 @@ func (m *HashRecv) GetHashlockId() []byte {
return nil return nil
} }
func (m *HashRecv) GetInfomation() *Hashlockquery { func (m *HashRecv) GetInformation() *Hashlockquery {
if m != nil { if m != nil {
return m.Infomation return m.Information
} }
return nil return nil
} }
...@@ -576,32 +576,32 @@ func init() { ...@@ -576,32 +576,32 @@ func init() {
func init() { proto.RegisterFile("hashlock.proto", fileDescriptor_acb83e90536b5ff8) } func init() { proto.RegisterFile("hashlock.proto", fileDescriptor_acb83e90536b5ff8) }
var fileDescriptor_acb83e90536b5ff8 = []byte{ var fileDescriptor_acb83e90536b5ff8 = []byte{
// 420 bytes of a gzipped FileDescriptorProto // 421 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x6e, 0x9b, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcd, 0x6a, 0xdb, 0x40,
0x10, 0xc7, 0xbd, 0xd8, 0xd8, 0xf5, 0x60, 0xfb, 0xb0, 0xfd, 0x10, 0x87, 0xaa, 0x42, 0xa8, 0xaa, 0x10, 0xc7, 0xbd, 0xb2, 0x65, 0xd7, 0x23, 0xdb, 0x87, 0xed, 0x07, 0x3a, 0x94, 0x22, 0x44, 0x29,
0x90, 0x2a, 0x59, 0xaa, 0xdb, 0x17, 0x70, 0x7b, 0xc1, 0x52, 0x4f, 0x9b, 0xe4, 0x1e, 0x02, 0x6b, 0x82, 0x82, 0xa1, 0x2e, 0xf4, 0xee, 0xf6, 0x22, 0x43, 0x4f, 0x9b, 0xe4, 0x01, 0x64, 0x69, 0x8d,
0xd9, 0x8a, 0xbd, 0xeb, 0x2c, 0x8b, 0x25, 0xf2, 0x18, 0x91, 0xf2, 0x2a, 0x79, 0x9c, 0x3c, 0x4b, 0x4d, 0xec, 0x5d, 0x67, 0xb5, 0x32, 0x28, 0x8f, 0x11, 0xc8, 0xab, 0xe4, 0x71, 0xf2, 0x2c, 0x61,
0xb4, 0x03, 0x64, 0x31, 0x49, 0x6e, 0xb9, 0x31, 0x7f, 0x7e, 0xcc, 0xc7, 0x7f, 0x06, 0x98, 0x6d, 0x47, 0x52, 0x56, 0x56, 0x92, 0x5b, 0x6e, 0x9a, 0xbf, 0x7e, 0x9a, 0x8f, 0xff, 0x8c, 0x60, 0xb6,
0x92, 0x7c, 0xb3, 0x93, 0xe9, 0xf5, 0xfc, 0xa0, 0xa4, 0x96, 0xd4, 0xd5, 0xe5, 0x81, 0xe7, 0xe1, 0x4d, 0xf2, 0xed, 0x5e, 0xa6, 0xd7, 0xf3, 0xa3, 0x92, 0x5a, 0x52, 0x57, 0x97, 0x47, 0x9e, 0x87,
0x23, 0x81, 0x0f, 0x71, 0xfd, 0x86, 0x7e, 0x03, 0x68, 0xa8, 0x55, 0xe6, 0x93, 0x80, 0x44, 0x13, 0x8f, 0x04, 0x3e, 0xc4, 0xf5, 0x1b, 0xfa, 0x0d, 0xa0, 0xa1, 0x56, 0x99, 0x4f, 0x02, 0x12, 0x4d,
0xd6, 0x52, 0xe8, 0x17, 0x18, 0xe6, 0x3a, 0xd1, 0x45, 0xee, 0x3b, 0x01, 0x89, 0x5c, 0x56, 0x47, 0x58, 0x4b, 0xa1, 0x5f, 0x60, 0x98, 0xeb, 0x44, 0x17, 0xb9, 0xef, 0x04, 0x24, 0x72, 0x59, 0x1d,
0xe6, 0xbb, 0x7f, 0x8a, 0x27, 0x9a, 0x9f, 0x6f, 0xf7, 0xdc, 0xef, 0x07, 0x24, 0xea, 0xb3, 0x96, 0x99, 0xef, 0xfe, 0x29, 0x9e, 0x68, 0x7e, 0xb9, 0x3b, 0x70, 0xbf, 0x1f, 0x90, 0xa8, 0xcf, 0x5a,
0x42, 0xbf, 0xc2, 0x58, 0xcb, 0x65, 0x96, 0x29, 0x9e, 0xe7, 0xfe, 0x20, 0x20, 0xd1, 0x98, 0x59, 0x0a, 0xfd, 0x0a, 0x63, 0x2d, 0x97, 0x59, 0xa6, 0x78, 0x9e, 0xfb, 0x83, 0x80, 0x44, 0x63, 0x66,
0x81, 0x7e, 0x87, 0xa9, 0xe2, 0xba, 0x50, 0xa2, 0x21, 0x5c, 0x24, 0x4e, 0x45, 0x53, 0x3b, 0xd9, 0x05, 0xfa, 0x1d, 0xa6, 0x8a, 0xeb, 0x42, 0x89, 0x86, 0x70, 0x91, 0x38, 0x17, 0x4d, 0xed, 0xe4,
0xcb, 0x42, 0x68, 0x7f, 0x88, 0xf9, 0xeb, 0xc8, 0xd4, 0x5e, 0x2b, 0x79, 0xcb, 0x85, 0x36, 0xb5, 0x20, 0x0b, 0xa1, 0xfd, 0x21, 0xe6, 0xaf, 0x23, 0x53, 0x7b, 0xa3, 0xe4, 0x2d, 0x17, 0xda, 0xd4,
0x47, 0x55, 0x6d, 0xab, 0x84, 0x77, 0x04, 0x26, 0xcd, 0x80, 0xff, 0xcd, 0x90, 0x36, 0x11, 0x39, 0x1e, 0x55, 0xb5, 0xad, 0x12, 0xde, 0x11, 0x98, 0x34, 0x03, 0xfe, 0x37, 0x43, 0xda, 0x44, 0xe4,
0x49, 0x44, 0x61, 0x80, 0x29, 0x1c, 0x54, 0xf1, 0xd9, 0x68, 0x66, 0x7c, 0x1c, 0x69, 0xc2, 0xf0, 0x2c, 0x11, 0x85, 0x01, 0xa6, 0x70, 0x50, 0xc5, 0x67, 0xa3, 0x99, 0xf1, 0x71, 0xa4, 0x09, 0xc3,
0xf9, 0x3d, 0x86, 0x09, 0x7f, 0xd8, 0x9e, 0xce, 0xb8, 0xa8, 0x8c, 0xe5, 0xa9, 0xe2, 0xba, 0x36, 0xe7, 0xf7, 0x18, 0x26, 0xfc, 0x61, 0x7b, 0xba, 0xe0, 0xa2, 0x32, 0x96, 0xa7, 0x8a, 0xeb, 0xda,
0xbd, 0x8e, 0xc2, 0x7b, 0x02, 0xd3, 0x06, 0xbc, 0x29, 0xb8, 0x2a, 0x9f, 0xbb, 0x24, 0xad, 0x2e, 0xf4, 0x3a, 0x0a, 0xef, 0x09, 0x4c, 0x1b, 0xf0, 0xa6, 0xe0, 0xaa, 0x7c, 0xee, 0x92, 0xb4, 0xba,
0xdf, 0x5a, 0x8b, 0x9d, 0xb4, 0xdf, 0xb5, 0x2c, 0xb5, 0xeb, 0x1a, 0x54, 0x96, 0x59, 0x85, 0x06, 0x7c, 0x6b, 0x2d, 0x76, 0xd2, 0x7e, 0xd7, 0xb2, 0xd4, 0xae, 0x6b, 0x50, 0x59, 0x66, 0x15, 0x1a,
0xe0, 0xa5, 0x85, 0x52, 0x5c, 0x68, 0x04, 0x5c, 0x04, 0xda, 0x52, 0x78, 0x59, 0x1d, 0x0d, 0xe3, 0x80, 0x97, 0x16, 0x4a, 0x71, 0xa1, 0x11, 0x70, 0x11, 0x68, 0x4b, 0xe1, 0xba, 0x3a, 0x1a, 0xc6,
0xe9, 0xd1, 0x64, 0x8b, 0x5f, 0x1c, 0x8d, 0x55, 0xe8, 0x1f, 0x80, 0x95, 0x58, 0xcb, 0x7d, 0xa2, 0xd3, 0x93, 0xc9, 0x16, 0xbf, 0x38, 0x1a, 0xab, 0xd0, 0x3f, 0xe0, 0xad, 0xc4, 0x46, 0xaa, 0x43,
0xb7, 0x52, 0x60, 0x87, 0xde, 0xe2, 0xd3, 0x1c, 0xaf, 0x6f, 0x7e, 0x32, 0x1b, 0x6b, 0x71, 0x61, 0xa2, 0x77, 0x52, 0x60, 0x8b, 0xde, 0xe2, 0xd3, 0x1c, 0xcf, 0x6f, 0x7e, 0x36, 0x1c, 0x6b, 0x83,
0x04, 0xb3, 0xe6, 0xe5, 0x85, 0xd8, 0xd5, 0x7b, 0x7b, 0xd5, 0xa3, 0x07, 0x62, 0xd1, 0x65, 0x6a, 0x61, 0x04, 0xb3, 0xe6, 0xed, 0x95, 0xd8, 0xd7, 0x9b, 0x7b, 0xd5, 0xa5, 0x07, 0x62, 0xd1, 0x65,
0x3e, 0xa6, 0x3f, 0xc1, 0xc5, 0x10, 0x49, 0x6f, 0xf1, 0xb1, 0x53, 0xcd, 0x9c, 0x41, 0xdc, 0x63, 0x6a, 0x3e, 0xa6, 0x3f, 0xc1, 0xc5, 0x10, 0x49, 0x6f, 0xf1, 0xb1, 0x53, 0xce, 0x1c, 0x42, 0xdc,
0x15, 0x83, 0x70, 0xce, 0x45, 0x56, 0xb7, 0xd6, 0x85, 0xcd, 0x7e, 0x10, 0x36, 0x0c, 0xfd, 0x05, 0x63, 0x15, 0x83, 0x70, 0xce, 0x45, 0x56, 0xf7, 0xd6, 0x85, 0xcd, 0x86, 0x10, 0x36, 0x0c, 0xfd,
0xa3, 0x4d, 0x81, 0xfd, 0xa0, 0xa7, 0xde, 0xe2, 0x73, 0x07, 0xaf, 0x9a, 0x8d, 0x7b, 0xac, 0xe1, 0x05, 0xa3, 0x6d, 0x81, 0xfd, 0xa0, 0xab, 0xde, 0xe2, 0x73, 0x07, 0xaf, 0x9a, 0x8d, 0x7b, 0xac,
0xe8, 0x0c, 0x1c, 0x5d, 0xa2, 0xcb, 0x2e, 0x73, 0x74, 0xf9, 0x77, 0x04, 0xee, 0x31, 0xd9, 0x15, 0xe1, 0xe8, 0x0c, 0x1c, 0x5d, 0xa2, 0xcf, 0x2e, 0x73, 0x74, 0xf9, 0x77, 0x04, 0xee, 0x29, 0xd9,
0xfc, 0x6a, 0x88, 0x3f, 0xe2, 0xef, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, 0x5e, 0xa0, 0xf4, 0x17, 0x7c, 0x3d, 0xc4, 0x5f, 0xf1, 0xf7, 0x53, 0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0xf6, 0x91,
0x9a, 0x03, 0x00, 0x00, 0xc1, 0x9c, 0x03, 0x00, 0x00,
} }
plugin/dapp/lottery/executor/lotterydb.go
View file @ 33922ee8
...@@ -548,11 +548,11 @@ func (action *Action) GetCalculableHash(beg, end int64, randMolNum int64) ([]byt ...@@ -548,11 +548,11 @@ func (action *Action) GetCalculableHash(beg, end int64, randMolNum int64) ([]byt
return modify, nil return modify, nil
} }
//random used for verfication in solo //random used for verification in solo
func (action *Action) findLuckyNum(isSolo bool, lott *LotteryDB) int64 { func (action *Action) findLuckyNum(isSolo bool, lott *LotteryDB) int64 {
var num int64 var num int64
if isSolo { if isSolo {
//used for internal verfication //used for internal verification
num = 12345 num = 12345
} else { } else {
randMolNum := (lott.TotalPurchasedTxNum+action.height-lott.LastTransToPurState)%3 + 2 //3~5 randMolNum := (lott.TotalPurchasedTxNum+action.height-lott.LastTransToPurState)%3 + 2 //3~5
......
plugin/dapp/pokerbull/executor/pokerbulldb.go
View file @ 33922ee8
...@@ -520,9 +520,9 @@ func (action *Action) checkPlayerExistInGame() bool { ...@@ -520,9 +520,9 @@ func (action *Action) checkPlayerExistInGame() bool {
} }
var value pkt.PBGameRecord var value pkt.PBGameRecord
lenght := len(values) length := len(values)
if lenght != 0 { if length != 0 {
valueBytes := values[lenght-1] valueBytes := values[length-1]
err := types.Decode(valueBytes, &value) err := types.Decode(valueBytes, &value)
if err == nil && value.Status == pkt.PBGameActionQuit { if err == nil && value.Status == pkt.PBGameActionQuit {
return false return false
......
plugin/dapp/privacy/commands/privacy.go
View file @ 33922ee8
...@@ -499,7 +499,7 @@ func showPrivacyAccountInfoFlag(cmd *cobra.Command) { ...@@ -499,7 +499,7 @@ func showPrivacyAccountInfoFlag(cmd *cobra.Command) {
cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().StringP("token", "t", types.BTY, "coins token, BTY supported.") cmd.Flags().StringP("token", "t", types.BTY, "coins token, BTY supported.")
cmd.Flags().Int32P("displaymode", "d", 0, "display mode.(0: display collect. 1:display avaliable detail. 2:display frozen detail. 3:display all") cmd.Flags().Int32P("displaymode", "d", 0, "display mode.(0: display collect. 1:display available detail. 2:display frozen detail. 3:display all")
} }
func showPrivacyAccountInfo(cmd *cobra.Command, args []string) { func showPrivacyAccountInfo(cmd *cobra.Command, args []string) {
......
plugin/dapp/privacy/wallet/privacy.go
View file @ 33922ee8
...@@ -38,7 +38,7 @@ func (policy *privacyPolicy) rescanAllTxAddToUpdateUTXOs() { ...@@ -38,7 +38,7 @@ func (policy *privacyPolicy) rescanAllTxAddToUpdateUTXOs() {
go policy.rescanReqTxDetailByAddr(acc.Addr, policy.rescanwg) go policy.rescanReqTxDetailByAddr(acc.Addr, policy.rescanwg)
} }
policy.rescanwg.Wait() policy.rescanwg.Wait()
bizlog.Debug("rescanAllTxToUpdateUTXOs sucess!") bizlog.Debug("rescanAllTxToUpdateUTXOs success!")
} }
//从blockchain模块同步addr参与的所有交易详细信息 //从blockchain模块同步addr参与的所有交易详细信息
...@@ -820,7 +820,7 @@ func (policy *privacyPolicy) rescanReqUtxosByAddr(addrs []string) { ...@@ -820,7 +820,7 @@ func (policy *privacyPolicy) rescanReqUtxosByAddr(addrs []string) {
defer policy.getWalletOperate().GetWaitGroup().Done() defer policy.getWalletOperate().GetWaitGroup().Done()
bizlog.Debug("RescanAllUTXO begin!") bizlog.Debug("RescanAllUTXO begin!")
policy.reqUtxosByAddr(addrs) policy.reqUtxosByAddr(addrs)
bizlog.Debug("RescanAllUTXO sucess!") bizlog.Debug("RescanAllUTXO success!")
} }
func (policy *privacyPolicy) reqUtxosByAddr(addrs []string) { func (policy *privacyPolicy) reqUtxosByAddr(addrs []string) {
......
plugin/dapp/retrieve/executor/retrieve_test.go
View file @ 33922ee8
...@@ -344,7 +344,7 @@ func estRetrievePerform(t *testing.T) { ...@@ -344,7 +344,7 @@ func estRetrievePerform(t *testing.T) {
func estRetrieveCancel(t *testing.T) { func estRetrieveCancel(t *testing.T) {
fmt.Println("\nTestRetrieveCancel start") fmt.Println("\nTestRetrieveCancel start")
fmt.Println("*This case is used for checking cancel operation\n*Cancel action is done with privkey of account A/B, although the cancel action for A could succeed, but the balance have been transfered by last action with backup a\n*currBalanceA = currBalanceA - 2*fee currBalanceB = currBalanceB + 1e8 - 2*fee") fmt.Println("*This case is used for checking cancel operation\n*Cancel action is done with privkey of account A/B, although the cancel action for A could succeed, but the balance have been transferred by last action with backup a\n*currBalanceA = currBalanceA - 2*fee currBalanceB = currBalanceB + 1e8 - 2*fee")
defer fmt.Println("TestRetrieveCancel end") defer fmt.Println("TestRetrieveCancel end")
var hashes [][]byte var hashes [][]byte
......
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