More refactoring

api/api.go

@@ -3,14 +3,13 @@ package api
 import (
 	"github.com/MinterTeam/minter-go-node/config"
 	"github.com/MinterTeam/minter-go-node/eventsdb"
+	"github.com/MinterTeam/minter-go-node/log"
+	"github.com/gorilla/mux"
+	"github.com/rs/cors"
 	"io"
 	"io/ioutil"
-	"log"
 	"net/http"
 
-	"github.com/gorilla/mux"
-	"github.com/rs/cors"
-
 	"github.com/MinterTeam/minter-go-node/core/minter"
 	"github.com/MinterTeam/minter-go-node/core/state"
 	"github.com/tendermint/go-amino"
@@ -70,7 +69,7 @@ func RunApi(b *minter.Blockchain, node *node.Node) {
 	// wait for tendermint to start
 	waitForTendermint()
 
-	log.Fatal(http.ListenAndServe(config.GetConfig().APIListenAddress, handler))
+	log.Error("Failed to start API", "err", http.ListenAndServe(config.GetConfig().APIListenAddress, handler))
 }
 
 func wrapper(f func(w http.ResponseWriter, r *http.Request)) func(w http.ResponseWriter, r *http.Request) {

cmd/minter/main.go

@@ -15,14 +15,11 @@ import (
 	"github.com/tendermint/tendermint/privval"
 	"github.com/tendermint/tendermint/proxy"
 	"os"
-	"runtime"
 )
 
 var cfg = config.GetConfig()
 
 func main() {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
 	err := common.EnsureDir(utils.GetMinterHome()+"/config", 0777)
 
 	if err != nil {

core/minter/minter.go

@@ -326,8 +326,6 @@ func (app *Blockchain) Commit() abciTypes.ResponseCommit {
 	binary.BigEndian.PutUint64(height, uint64(app.height))
 	app.appDB.Set([]byte("height"), height)
 
-	// TODO: clear candidates list
-
 	app.updateCurrentRootHash()
 	app.updateCurrentState()
 

eventsdb/eventsdb.go

@@ -116,10 +116,7 @@ func (db *EventsDB) FlushEvents(height int64) error {
 	}
 
 	db.cache.Clear()
-
-	db.lock.Lock()
 	db.db.Set(getKeyForHeight(height), bytes)
-	db.lock.Unlock()
 
 	return nil
 }