X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=api%2Fapi.go;h=937f8f86b2a915fc20557121eaaaef9f7f70796d;hb=b3065dfd76cff7942569ae0d4f3507b5437dfa70;hp=b45a30bfc83717642680bbb337c1c3a351bafaf0;hpb=ddc7106558f020bde24cc337d51649611dddaba8;p=bytom%2Fvapor.git diff --git a/api/api.go b/api/api.go index b45a30bf..937f8f86 100644 --- a/api/api.go +++ b/api/api.go @@ -18,7 +18,6 @@ import ( "github.com/vapor/dashboard/equity" "github.com/vapor/errors" "github.com/vapor/mining/miner" - "github.com/vapor/mining/miningpool" "github.com/vapor/net/http/authn" "github.com/vapor/net/http/gzip" "github.com/vapor/net/http/httpjson" @@ -114,7 +113,6 @@ type API struct { txFeedTracker *txfeed.Tracker //cpuMiner *cpuminer.CPUMiner miner *miner.Miner - miningPool *miningpool.MiningPool notificationMgr *websocket.WSNotificationManager newBlockCh chan *bc.Hash } @@ -170,7 +168,7 @@ func (a *API) StartServer(address string) { } // NewAPI create and initialize the API -func NewAPI(sync *netsync.SyncManager, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, miner *miner.Miner, miningPool *miningpool.MiningPool, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, newBlockCh chan *bc.Hash, notificationMgr *websocket.WSNotificationManager) *API { +func NewAPI(sync *netsync.SyncManager, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, miner *miner.Miner, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, newBlockCh chan *bc.Hash, notificationMgr *websocket.WSNotificationManager) *API { api := &API{ sync: sync, wallet: wallet, @@ -178,7 +176,6 @@ func NewAPI(sync *netsync.SyncManager, wallet *wallet.Wallet, txfeeds *txfeed.Tr accessTokens: token, txFeedTracker: txfeeds, miner: miner, - miningPool: miningPool, newBlockCh: newBlockCh, notificationMgr: notificationMgr, @@ -295,12 +292,6 @@ func (a *API) buildHandler() { m.Handle("/is-mining", jsonHandler(a.isMining)) m.Handle("/set-mining", jsonHandler(a.setMining)) - m.Handle("/get-work", jsonHandler(a.getWork)) - m.Handle("/get-work-json", jsonHandler(a.getWorkJSON)) - m.Handle("/submit-block", jsonHandler(a.submitBlock)) - m.Handle("/submit-work", jsonHandler(a.submitWork)) - m.Handle("/submit-work-json", jsonHandler(a.submitWorkJSON)) - m.Handle("/verify-message", jsonHandler(a.verifyMessage)) m.Handle("/compile", jsonHandler(a.compileEquity))