OSDN Git Service
(root)
/
bytom
/
bytom-spv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ba6cb7
)
add getWorkJSON and submitWorkJSON
author
HAOYUatHZ
<haoyu@protonmail.com>
Mon, 4 Jun 2018 03:12:04 +0000
(11:12 +0800)
committer
HAOYUatHZ
<haoyu@protonmail.com>
Mon, 4 Jun 2018 03:12:04 +0000
(11:12 +0800)
api/api.go
patch
|
blob
|
history
api/miner.go
patch
|
blob
|
history
diff --git
a/api/api.go
b/api/api.go
index
0344b38
..
c919c21
100644
(file)
--- a/
api/api.go
+++ b/
api/api.go
@@
-233,9
+233,9
@@
func (a *API) buildHandler() {
m.Handle("/set-mining", jsonHandler(a.setMining))
m.Handle("/get-work", jsonHandler(a.getWork))
m.Handle("/set-mining", jsonHandler(a.setMining))
m.Handle("/get-work", jsonHandler(a.getWork))
- m.Handle("/get-work-json", jsonHandler(a.getWork))
+ m.Handle("/get-work-json", jsonHandler(a.getWork
JSON
))
m.Handle("/submit-work", jsonHandler(a.submitWork))
m.Handle("/submit-work", jsonHandler(a.submitWork))
- m.Handle("/submit-work-json", jsonHandler(a.submitWork))
+ m.Handle("/submit-work-json", jsonHandler(a.submitWork
JSON
))
m.Handle("/verify-message", jsonHandler(a.verifyMessage))
m.Handle("/decode-program", jsonHandler(a.decodeProgram))
m.Handle("/verify-message", jsonHandler(a.verifyMessage))
m.Handle("/decode-program", jsonHandler(a.decodeProgram))
diff --git
a/api/miner.go
b/api/miner.go
index
397fd64
..
d183459
100644
(file)
--- a/
api/miner.go
+++ b/
api/miner.go
@@
-16,6
+16,14
@@
func (a *API) getWork() Response {
return NewSuccessResponse(work)
}
return NewSuccessResponse(work)
}
+func (a *API) getWorkJSON() Response {
+ work, err := a.GetWork()
+ if err != nil {
+ return NewErrorResponse(err)
+ }
+ return NewSuccessResponse(work)
+}
+
// SubmitWorkReq used to submitWork req
type SubmitWorkReq struct {
BlockHeader *types.BlockHeader `json:"block_header"`
// SubmitWorkReq used to submitWork req
type SubmitWorkReq struct {
BlockHeader *types.BlockHeader `json:"block_header"`
@@
-28,6
+36,13
@@
func (a *API) submitWork(ctx context.Context, req *SubmitWorkReq) Response {
return NewSuccessResponse(true)
}
return NewSuccessResponse(true)
}
+func (a *API) submitWorkJSON(ctx context.Context, req *SubmitWorkReq) Response {
+ if err := a.SubmitWork(req.BlockHeader); err != nil {
+ return NewErrorResponse(err)
+ }
+ return NewSuccessResponse(true)
+}
+
// GetWorkResp is resp struct for API
type GetWorkResp struct {
BlockHeader *types.BlockHeader `json:"block_header"`
// GetWorkResp is resp struct for API
type GetWorkResp struct {
BlockHeader *types.BlockHeader `json:"block_header"`