Merge pull request #36 from Bit-Nation/feature/protbuf_api_switch

keystore api switch

Gopkg.toml

@@ -32,10 +32,6 @@
   branch = "master"
   name = "github.com/Bit-Nation/x3dh"
 
-[[constraint]]
-  name = "github.com/asaskevich/govalidator"
-  version = "9.0.0"
-
 [[constraint]]
   name = "github.com/ethereum/go-ethereum"
   version = "1.8.11"

api/api.go

@@ -28,6 +28,7 @@ func New(client UpStream) *API {
 }
 
 type API struct {
+	DoubleRatchetKeyStoreApi
 	lock     sync.Mutex
 	requests map[string]chan *Response
 	client   UpStream
@@ -40,7 +41,7 @@ type API struct {
 type Response struct {
 	Msg    *pb.Response
 	Error  error
-	Closer <-chan error
+	Closer chan error
 }
 
 // send a response for a received api request
@@ -125,7 +126,10 @@ func (a *API) request(req *pb.Request, timeOut time.Duration) (*Response, error)
 	// or time out
 	select {
 	case res := <-reqChan:
-		return res, nil
+		if res.Error != nil {
+			res.Closer <- nil
+		}
+		return res, res.Error
 	case <-time.After(timeOut):
 		// remove request from stack
 		_, err := a.cutRequest(requestId.String())

api/api_test.go

@@ -64,17 +64,15 @@ func TestRequestResponse(t *testing.T) {
 				panic(err)
 			}
 			receivedRequestID = req.RequestID
-			out := api.Respond(req.RequestID, &pb.Response{
-				RequestID: req.RequestID,
-			}, nil, time.Second)
+			out := api.Respond(req.RequestID, &pb.Response{}, nil, time.Second)
 			if out != nil {
 				panic("expected nil but got: " + out.Error())
 			}
 		}
 	}()
 
 	resp, err := api.request(&pb.Request{}, time.Second)
+	resp.Closer <- nil
 	require.Nil(t, err)
-	require.Equal(t, resp.Msg.RequestID, receivedRequestID)
 
 }