Mercurial > lbo > hg > clusterconsensus

changeset 13:d6addc699f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GenericResponse for ChangeMemberRequests
author Lewin Bormann <lbo@spheniscida.de>
date Sat, 08 Oct 2016 11:57:27 +0200
parents db582b4578e9
children 3b439fdf89f4
files http/http.go http/json.go
diffstat 2 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/http/http.go	Sat Oct 08 11:57:10 2016 +0200
+++ b/http/http.go	Sat Oct 08 11:57:27 2016 +0200
@@ -131,13 +131,13 @@
 		return con.NewError(con.ERR_ENCODING, "JSON Encoding error", err)
 	}
 
-	var decoded ChangeMemberResponse
+	var decoded GenericResponse
 
 	if err := t.postRequest(body, method_ADDMEMBER, &decoded); err != nil {
 		return err
 	}
 
-	if decoded.Fail {
+	if !decoded.Accepted {
 		return decoded.Err.ToError()
 	}
 
@@ -151,13 +151,13 @@
 		return con.NewError(con.ERR_ENCODING, "JSON Encoding error", err)
 	}
 
-	var decoded ChangeMemberResponse
+	var decoded GenericResponse
 
 	if err := t.postRequest(body, method_RMMEMBER, &decoded); err != nil {
 		return err
 	}
 
-	if decoded.Fail {
+	if !decoded.Accepted {
 		return decoded.Err.ToError()
 	}
 
--- a/http/json.go	Sat Oct 08 11:57:10 2016 +0200
+++ b/http/json.go	Sat Oct 08 11:57:27 2016 +0200
@@ -47,11 +47,6 @@
 	Mem      JSONAddress
 }
 
-type ChangeMemberResponse struct {
-	Fail bool
-	Err  JSONErr
-}
-
 type StartParticipationRequest struct {
 	Instance     uint64
 	Sequence     uint64