kvazar/keva-stratum
1
0
Fork 0
mirror of https://github.com/kvazar-network/keva-stratum.git synced 2025-03-12 14:01:16 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up code style

Browse Source
This commit is contained in:
Sammy Libre 2016-12-07 01:54:26 +05:00
parent 98f1c60a74
commit 7ac236a393
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go-pool/stratum/handlers.go
View File

@ -87,8 +87,8 @@ func (s *StratumServer) handleSubmitRPC(cs *Session, e *Endpoint, params *Submit
} }
t := s.currentBlockTemplate() t := s.currentBlockTemplate()
if job.Height != t.Height { if job.height != t.Height {
log.Printf("Block expired for height %v %s@%s", job.Height, miner.Id, miner.IP) log.Printf("Block expired for height %v %s@%s", job.height, miner.Id, miner.IP)
errorReply = &ErrorReply{Code: -1, Message: "Block expired", Close: false} errorReply = &ErrorReply{Code: -1, Message: "Block expired", Close: false}
atomic.AddUint64(&miner.staleShares, 1) atomic.AddUint64(&miner.staleShares, 1)
return return

26
go-pool/stratum/miner.go
View File

@ -16,11 +16,11 @@ import (
type Job struct { type Job struct {
sync.RWMutex sync.RWMutex
Id string id string
ExtraNonce uint32 extraNonce uint32
Height int64 height int64
Difficulty int64 difficulty int64
Submissions map[string]bool submissions map[string]struct{}
} }
type Miner struct { type Miner struct {
@ -42,11 +42,11 @@ type Miner struct {
func (job *Job) submit(nonce string) bool { func (job *Job) submit(nonce string) bool {
job.Lock() job.Lock()
defer job.Unlock() defer job.Unlock()
_, exist := job.Submissions[nonce] _, exist := job.submissions[nonce]
if exist { if exist {
return true return true
} }
job.Submissions[nonce] = true job.submissions[nonce] = struct{}{}
return false return false
} }
@ -64,10 +64,10 @@ func (cs *Session) getJob(t *BlockTemplate) *JobReplyData {
extraNonce := atomic.AddUint32(&cs.endpoint.extraNonce, 1) extraNonce := atomic.AddUint32(&cs.endpoint.extraNonce, 1)
blob := t.nextBlob(extraNonce, cs.endpoint.instanceId) blob := t.nextBlob(extraNonce, cs.endpoint.instanceId)
job := &Job{Id: util.Random(), ExtraNonce: extraNonce, Height: t.Height, Difficulty: cs.difficulty} job := &Job{id: util.Random(), extraNonce: extraNonce, height: t.Height, difficulty: cs.difficulty}
job.Submissions = make(map[string]bool) job.submissions = make(map[string]struct{})
cs.pushJob(job) cs.pushJob(job)
reply := &JobReplyData{JobId: job.Id, Blob: blob, Target: cs.targetHex} reply := &JobReplyData{JobId: job.id, Blob: blob, Target: cs.targetHex}
return reply return reply
} }
@ -85,7 +85,7 @@ func (cs *Session) findJob(id string) *Job {
cs.Lock() cs.Lock()
defer cs.Unlock() defer cs.Unlock()
for _, job := range cs.validJobs { for _, job := range cs.validJobs {
if job.Id == id { if job.id == id {
return job return job
} }
} }
@ -138,7 +138,7 @@ func (m *Miner) processShare(s *StratumServer, e *Endpoint, job *Job, t *BlockTe
copy(shareBuff[t.ReservedOffset+4:t.ReservedOffset+7], e.instanceId) copy(shareBuff[t.ReservedOffset+4:t.ReservedOffset+7], e.instanceId)
extraBuff := new(bytes.Buffer) extraBuff := new(bytes.Buffer)
binary.Write(extraBuff, binary.BigEndian, job.ExtraNonce) binary.Write(extraBuff, binary.BigEndian, job.extraNonce)
copy(shareBuff[t.ReservedOffset:], extraBuff.Bytes()) copy(shareBuff[t.ReservedOffset:], extraBuff.Bytes())
nonceBuff, _ := hex.DecodeString(nonce) nonceBuff, _ := hex.DecodeString(nonce)
@ -184,7 +184,7 @@ func (m *Miner) processShare(s *StratumServer, e *Endpoint, job *Job, t *BlockTe
atomic.StoreInt64(&r.LastSubmissionAt, util.MakeTimestamp()) atomic.StoreInt64(&r.LastSubmissionAt, util.MakeTimestamp())
log.Printf("Block %v found at height %v by miner %v@%v", blockFastHash[0:6], t.Height, m.Id, m.IP) log.Printf("Block %v found at height %v by miner %v@%v", blockFastHash[0:6], t.Height, m.Id, m.IP)
} }
} else if hashDiff < job.Difficulty { } else if hashDiff < job.difficulty {
log.Printf("Rejected low difficulty share of %v from %v@%v", hashDiff, m.Id, m.IP) log.Printf("Rejected low difficulty share of %v from %v@%v", hashDiff, m.Id, m.IP)
atomic.AddUint64(&m.invalidShares, 1) atomic.AddUint64(&m.invalidShares, 1)
return false return false