X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=api%2Fapi.go;fp=api%2Fapi.go;h=a030f39227cb8749ba2880243fbfdd6c7cbc8e7b;hp=88f43e59d75a48e221817c3cd4fc086439c74b62;hb=9d6411618dc26b22d6b1943dc0e600e1e6dd072f;hpb=4471c12ef73de06e2303e643273c09e10da3e3ee diff --git a/api/api.go b/api/api.go index 88f43e59..a030f392 100644 --- a/api/api.go +++ b/api/api.go @@ -12,7 +12,6 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/vapor/accesstoken" - "github.com/vapor/blockchain/txfeed" cfg "github.com/vapor/config" "github.com/vapor/dashboard/dashboard" "github.com/vapor/dashboard/equity" @@ -112,7 +111,6 @@ type API struct { chain *protocol.Chain server *http.Server handler http.Handler - txFeedTracker *txfeed.Tracker blockProposer *blockproposer.BlockProposer notificationMgr *websocket.WSNotificationManager eventDispatcher *event.Dispatcher @@ -180,13 +178,12 @@ type NetSync interface { } // NewAPI create and initialize the API -func NewAPI(sync NetSync, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, blockProposer *blockproposer.BlockProposer, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, dispatcher *event.Dispatcher, notificationMgr *websocket.WSNotificationManager) *API { +func NewAPI(sync NetSync, wallet *wallet.Wallet, blockProposer *blockproposer.BlockProposer, chain *protocol.Chain, config *cfg.Config, token *accesstoken.CredentialStore, dispatcher *event.Dispatcher, notificationMgr *websocket.WSNotificationManager) *API { api := &API{ sync: sync, wallet: wallet, chain: chain, accessTokens: token, - txFeedTracker: txfeeds, blockProposer: blockProposer, eventDispatcher: dispatcher, notificationMgr: notificationMgr, @@ -266,12 +263,6 @@ func (a *API) buildHandler() { m.Handle("/delete-access-token", jsonHandler(a.deleteAccessToken)) m.Handle("/check-access-token", jsonHandler(a.checkAccessToken)) - m.Handle("/create-transaction-feed", jsonHandler(a.createTxFeed)) - m.Handle("/get-transaction-feed", jsonHandler(a.getTxFeed)) - m.Handle("/update-transaction-feed", jsonHandler(a.updateTxFeed)) - m.Handle("/delete-transaction-feed", jsonHandler(a.deleteTxFeed)) - m.Handle("/list-transaction-feeds", jsonHandler(a.listTxFeeds)) - m.Handle("/submit-transaction", jsonHandler(a.submit)) m.Handle("/submit-transactions", jsonHandler(a.submitTxs)) m.Handle("/estimate-transaction-gas", jsonHandler(a.estimateTxGas))