Merge pull request #8 from Switcheo/fix/oracle-blocking

Fix/oracle blocking

abci/client/grpc_client.go

@@ -258,8 +258,8 @@ func (cli *grpcClient) ValidateOracleVotes(ctx context.Context, req *types.Reque
 	return cli.client.ValidateOracleVotes(ctx, types.ToRequestValidateOracleVotes(req).GetValidateOracleVotes(), grpc.WaitForReady(true))
 }
 
-func (cli *grpcClient) DoesOracleResultExist(ctx context.Context, req *types.RequestDoesOracleResultExist) (*types.ResponseDoesOracleResultExist, error) {
-	return cli.client.DoesOracleResultExist(ctx, types.ToRequestDoesOracleResultExist(req).GetDoesOracleResultExist(), grpc.WaitForReady(true))
+func (cli *grpcClient) FetchOracleResults(ctx context.Context, req *types.RequestFetchOracleResults) (*types.ResponseFetchOracleResults, error) {
+	return cli.client.FetchOracleResults(ctx, types.ToRequestFetchOracleResults(req).GetFetchOracleResults(), grpc.WaitForReady(true))
 }
 
 func (cli *grpcClient) DoesSubAccountBelongToVal(ctx context.Context, req *types.RequestDoesSubAccountBelongToVal) (*types.ResponseDoesSubAccountBelongToVal, error) {

abci/client/socket_client.go

@@ -445,15 +445,15 @@ func (cli *socketClient) ValidateOracleVotes(ctx context.Context, req *types.Req
 	return reqRes.Response.GetValidateOracleVotes(), cli.Error()
 }
 
-func (cli *socketClient) DoesOracleResultExist(ctx context.Context, req *types.RequestDoesOracleResultExist) (*types.ResponseDoesOracleResultExist, error) {
-	reqRes, err := cli.queueRequest(ctx, types.ToRequestDoesOracleResultExist(req))
+func (cli *socketClient) FetchOracleResults(ctx context.Context, req *types.RequestFetchOracleResults) (*types.ResponseFetchOracleResults, error) {
+	reqRes, err := cli.queueRequest(ctx, types.ToRequestFetchOracleResults(req))
 	if err != nil {
 		return nil, err
 	}
 	if err := cli.Flush(ctx); err != nil {
 		return nil, err
 	}
-	return reqRes.Response.GetDoesOracleResultExist(), cli.Error()
+	return reqRes.Response.GetFetchOracleResults(), cli.Error()
 }
 
 func (cli *socketClient) DoesSubAccountBelongToVal(ctx context.Context, req *types.RequestDoesSubAccountBelongToVal) (*types.ResponseDoesSubAccountBelongToVal, error) {

abci/types/application.go

@@ -39,7 +39,7 @@ type Application interface {
 	CreateOracleResultTx(context.Context, *RequestCreateOracleResultTx) (*ResponseCreateOracleResultTx, error)
 	FetchOracleVotes(context.Context, *RequestFetchOracleVotes) (*ResponseFetchOracleVotes, error)
 	ValidateOracleVotes(context.Context, *RequestValidateOracleVotes) (*ResponseValidateOracleVotes, error)
-	DoesOracleResultExist(context.Context, *RequestDoesOracleResultExist) (*ResponseDoesOracleResultExist, error)
+	FetchOracleResults(context.Context, *RequestFetchOracleResults) (*ResponseFetchOracleResults, error)
 	DoesSubAccountBelongToVal(context.Context, *RequestDoesSubAccountBelongToVal) (*ResponseDoesSubAccountBelongToVal, error)
 }
 
@@ -139,8 +139,8 @@ func (BaseApplication) ValidateOracleVotes(_ context.Context, req *RequestValida
 	return &ResponseValidateOracleVotes{}, nil
 }
 
-func (BaseApplication) DoesOracleResultExist(_ context.Context, req *RequestDoesOracleResultExist) (*ResponseDoesOracleResultExist, error) {
-	return &ResponseDoesOracleResultExist{}, nil
+func (BaseApplication) FetchOracleResults(_ context.Context, req *RequestFetchOracleResults) (*ResponseFetchOracleResults, error) {
+	return &ResponseFetchOracleResults{}, nil
 }
 
 func (BaseApplication) DoesSubAccountBelongToVal(_ context.Context, req *RequestDoesSubAccountBelongToVal) (*ResponseDoesSubAccountBelongToVal, error) {

abci/types/messages.go

@@ -142,9 +142,9 @@ func ToRequestValidateOracleVotes(req *RequestValidateOracleVotes) *Request {
 	}
 }
 
-func ToRequestDoesOracleResultExist(req *RequestDoesOracleResultExist) *Request {
+func ToRequestFetchOracleResults(req *RequestFetchOracleResults) *Request {
 	return &Request{
-		Value: &Request_DoesOracleResultExist{req},
+		Value: &Request_FetchOracleResults{req},
 	}
 }