Change leader endpoint to info.

Fix typo errors.

api/apihttp/apihttp.go

@@ -23,12 +23,12 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/bbva/qed/log"
 	"github.com/bbva/qed/metrics"
 	"github.com/bbva/qed/protocol"
 	"github.com/bbva/qed/raftwal"
-
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // HealthCheckResponse contains the response from HealthCheckHandler.
@@ -316,13 +316,14 @@ func AuthHandlerMiddleware(handler http.HandlerFunc) http.HandlerFunc {
 //	/events -> Add
 //	/proofs/membership -> Membership
 func NewApiHttp(balloon raftwal.RaftBalloonApi) *http.ServeMux {
+
 	api := http.NewServeMux()
 	api.HandleFunc("/health-check", AuthHandlerMiddleware(HealthCheckHandler))
 	api.HandleFunc("/events", AuthHandlerMiddleware(Add(balloon)))
 	api.HandleFunc("/proofs/membership", AuthHandlerMiddleware(Membership(balloon)))
 	api.HandleFunc("/proofs/digest-membership", AuthHandlerMiddleware(DigestMembership(balloon)))
 	api.HandleFunc("/proofs/incremental", AuthHandlerMiddleware(Incremental(balloon)))
-	api.HandleFunc("/leader", AuthHandlerMiddleware(LeaderHandle(balloon)))
+	api.HandleFunc("/info", AuthHandlerMiddleware(InfoHandle(balloon)))
 
 	return api
 }
@@ -362,15 +363,15 @@ func LogHandler(handle http.Handler) http.HandlerFunc {
 	}
 }
 
-func LeaderHandle(balloon raftwal.RaftBalloonApi) http.HandlerFunc {
+func InfoHandle(balloon raftwal.RaftBalloonApi) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != "GET" {
 			w.Header().Set("Allow", "GET")
 			w.WriteHeader(http.StatusMethodNotAllowed)
 			return
 		}
 
-		out, err := json.Marshal(balloon.LeaderAddr())
+		out, err := json.Marshal(balloon.Info())
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

api/apihttp/apihttp_test.go

@@ -88,8 +88,11 @@ func (b fakeRaftBalloon) QueryConsistency(start, end uint64) (*balloon.Increment
 	return &ip, nil
 }
 
-func (b fakeRaftBalloon) LeaderAddr() string {
-	return b.raftBindAddr
+func (b fakeRaftBalloon) Info() map[string]interface{} {
+	m := make(map[string]interface{})
+	m["Type"] = "fakeRaftBalloon"
+	m["LeaderAddr"] = b.raftBindAddr
+	return m
 }
 
 func TestHealthCheckHandler(t *testing.T) {

balloon/history/proof.go

@@ -122,7 +122,6 @@ func (p IncrementalProof) Verify(startDigest, endDigest hashing.Digest) (correct
 	// visit the pruned trees
 	startRecomputed := startPruned.PostOrder(computeHash).(hashing.Digest)
 	endRecomputed := endPruned.PostOrder(computeHash).(hashing.Digest)
-
 	return bytes.Equal(startRecomputed, startDigest) && bytes.Equal(endRecomputed, endDigest)
 
 }

client/client.go

@@ -286,12 +286,11 @@ func (c HTTPClient) VerifyIncremental(
 		Version:       startSnapshot.Version,
 	}
 	end := &balloon.Snapshot{
-		HistoryDigest: endSnapshot.EventDigest,
-		EventDigest:   endSnapshot.HistoryDigest,
+		EventDigest:   endSnapshot.EventDigest,
+		HistoryDigest: endSnapshot.HistoryDigest,
 		HyperDigest:   endSnapshot.HyperDigest,
 		Version:       endSnapshot.Version,
 	}
 
 	return proof.Verify(start, end)
-
 }

raftwal/raft.go

@@ -57,7 +57,7 @@ type RaftBalloonApi interface {
 	QueryConsistency(start, end uint64) (*balloon.IncrementalProof, error)
 	// Join joins the node, identified by nodeID and reachable at addr, to the cluster
 	Join(nodeID, addr string) error
-	LeaderAddr() string
+	Info() map[string]interface{}
 }
 
 // RaftBalloon is a replicated verifiable key-value store, where changes are made via Raft consensus.
@@ -319,6 +319,14 @@ func (b *RaftBalloon) ID() string {
 	return b.id
 }
 
+// TODO Improve info structure.
+// Info returns the Raft leader address.
+func (b *RaftBalloon) Info() map[string]interface{} {
+	m := make(map[string]interface{})
+	m["LeaderAddr"] = b.LeaderAddr()
+	return m
+}
+
 // LeaderID returns the node ID of the Raft leader. Returns a
 // blank string if there is no leader, or an error.
 func (b *RaftBalloon) LeaderID() (string, error) {