feat(HTTP): Integrate AddRowDouble and update tests (#926)

pactus-project · Jan 10, 2024 · eab6bb3 · eab6bb3
1 parent 24be352
commit eab6bb3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/state/mock.go b/state/mock.go
@@ -261,5 +261,5 @@ func (m *MockState) PublicKey(addr crypto.Address) (crypto.PublicKey, error) {
 }
 
 func (m *MockState) AvailabilityScore(_ int32) float64 {
-	return 1.0
+	return 0.987
 }
diff --git a/www/http/blockchain.go b/www/http/blockchain.go
@@ -170,7 +170,7 @@ func (s *Server) writeValidatorTable(val *pactus.ValidatorInfo) *tableMaker {
 	tm.addRowInt("LastBondingHeight", int(val.LastBondingHeight))
 	tm.addRowInt("LastSortitionHeight", int(val.LastSortitionHeight))
 	tm.addRowInt("UnbondingHeight", int(val.UnbondingHeight))
-	tm.addRowInt("AvailabilityScore", int(val.AvailabilityScore))
+	tm.addRowDouble("AvailabilityScore", val.AvailabilityScore)
 	tm.addRowBytes("Hash", val.Hash)
 
 	return tm

diff --git a/www/http/blockchain_test.go b/www/http/blockchain_test.go
@@ -158,16 +158,6 @@ func TestValidator(t *testing.T) {
 
 	val := td.mockState.TestStore.AddTestValidator()
 
-	t.Run("Shall return a validator", func(t *testing.T) {
-		w := httptest.NewRecorder()
-		r := new(http.Request)
-		r = mux.SetURLVars(r, map[string]string{"address": val.Address().String()})
-		td.httpServer.GetValidatorHandler(w, r)
-
-		assert.Equal(t, w.Code, 200)
-		fmt.Println(w.Body)
-	})
-
 	t.Run("Shall return an error, non exist", func(t *testing.T) {
 		w := httptest.NewRecorder()
 		r := new(http.Request)
@@ -205,6 +195,18 @@ func TestValidator(t *testing.T) {
 		assert.Equal(t, w.Code, 400)
 		fmt.Println(w.Body)
 	})
+
+	t.Run("Shall return a validator", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		r := new(http.Request)
+		r = mux.SetURLVars(r, map[string]string{"address": val.Address().String()})
+
+		td.httpServer.GetValidatorHandler(w, r)
+
+		assert.Equal(t, w.Code, 200)
+		assert.Contains(t, w.Body.String(), "0.987")
+		fmt.Println(w.Body)
+	})
 }
 
 func TestValidatorByNumber(t *testing.T) {

diff --git a/www/http/server.go b/www/http/server.go
@@ -215,6 +215,10 @@ func (t *tableMaker) addRowBytes(key string, val []byte) {
 	fmt.Fprintf(t.w, "<tr><td>%s</td><td>%x</td></tr>", key, val)
 }
 
+func (t *tableMaker) addRowDouble(key string, val float64) {
+	fmt.Fprintf(t.w, "<tr><td>%s</td><td>%f</td></tr>", key, val)
+}
+
 func (t *tableMaker) html() string {
 	t.w.WriteString("</table>")
 	return t.w.String()