rename (#465)

[bytom/vapor.git] / api / api.go

diff --git a/api/api.go b/api/api.go
index 2396703..cc54ae8 100644 (file)
--- a/api/api.go
+++ b/api/api.go
@@ -11,23 +11,22 @@ import (
        log "github.com/sirupsen/logrus"
        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"
-       "github.com/vapor/errors"
-       "github.com/vapor/event"
-       "github.com/vapor/mining/cpuminer"
-       "github.com/vapor/net/http/authn"
-       "github.com/vapor/net/http/gzip"
-       "github.com/vapor/net/http/httpjson"
-       "github.com/vapor/net/http/static"
-       "github.com/vapor/net/websocket"
-       "github.com/vapor/netsync"
-       "github.com/vapor/p2p"
-       "github.com/vapor/protocol"
-       "github.com/vapor/wallet"
+       "github.com/bytom/vapor/accesstoken"
+       cfg "github.com/bytom/vapor/config"
+       "github.com/bytom/vapor/dashboard/dashboard"
+       "github.com/bytom/vapor/dashboard/equity"
+       "github.com/bytom/vapor/errors"
+       "github.com/bytom/vapor/event"
+       "github.com/bytom/vapor/net/http/authn"
+       "github.com/bytom/vapor/net/http/gzip"
+       "github.com/bytom/vapor/net/http/httpjson"
+       "github.com/bytom/vapor/net/http/static"
+       "github.com/bytom/vapor/net/websocket"
+       "github.com/bytom/vapor/netsync/peers"
+       "github.com/bytom/vapor/p2p"
+       "github.com/bytom/vapor/proposal/blockproposer"
+       "github.com/bytom/vapor/protocol"
+       "github.com/bytom/vapor/wallet"
 )
 
 var (
@@ -112,8 +111,7 @@ type API struct {
        chain           *protocol.Chain
        server          *http.Server
        handler         http.Handler
-       txFeedTracker   *txfeed.Tracker
-       cpuMiner        *cpuminer.CPUMiner
+       blockProposer   *blockproposer.BlockProposer
        notificationMgr *websocket.WSNotificationManager
        eventDispatcher *event.Dispatcher
 }
@@ -173,21 +171,20 @@ type NetSync interface {
        IsCaughtUp() bool
        PeerCount() int
        GetNetwork() string
-       BestPeer() *netsync.PeerInfo
+       BestPeer() *peers.PeerInfo
        DialPeerWithAddress(addr *p2p.NetAddress) error
-       GetPeerInfos() []*netsync.PeerInfo
+       GetPeerInfos() []*peers.PeerInfo
        StopPeer(peerID string) error
 }
 
 // NewAPI create and initialize the API
-func NewAPI(sync NetSync, wallet *wallet.Wallet, txfeeds *txfeed.Tracker, cpuMiner *cpuminer.CPUMiner, 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,
-               cpuMiner:        cpuMiner,
+               blockProposer:   blockProposer,
                eventDispatcher: dispatcher,
                notificationMgr: notificationMgr,
        }
@@ -245,6 +242,7 @@ func (a *API) buildHandler() {
 
                m.Handle("/list-balances", jsonHandler(a.listBalances))
                m.Handle("/list-unspent-outputs", jsonHandler(a.listUnspentOutputs))
+               m.Handle("/list-account-votes", jsonHandler(a.listAccountVotes))
 
                m.Handle("/decode-program", jsonHandler(a.decodeProgram))
 
@@ -265,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))
@@ -300,6 +292,8 @@ func (a *API) buildHandler() {
 
        m.Handle("/get-merkle-proof", jsonHandler(a.getMerkleProof))
 
+       m.Handle("/get-vote-result", jsonHandler(a.getVoteResult))
+
        m.HandleFunc("/websocket-subscribe", a.websocketHandler)
 
        handler := walletHandler(m, walletEnable)