fix: bump chain-sdk (#365)

remove Validate endpoint

Signed-off-by: Artur Troian <troian@users.noreply.github.com>
Co-authored-by: Artur Troian <troian@users.noreply.github.com>

Author: troian

gateway/grpc/server.go

@@ -8,10 +8,12 @@ import (
 	"time"
 
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/keepalive"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
+	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"pkg.akt.dev/go/util/ctxlog"
 
@@ -36,6 +38,10 @@ type grpcProviderV1 struct {
 	client provider.StatusClient
 }
 
+func (gm *grpcProviderV1) BidScreening(ctx context.Context, request *providerv1.BidScreeningRequest) (*providerv1.BidScreeningResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "BidScreening not implemented")
+}
+
 var _ providerv1.ProviderRPCServer = (*grpcProviderV1)(nil)
 
 func ContextWithClaims(ctx context.Context, claims *ajwt.Claims) context.Context {

gateway/rest/integration_test.go

@@ -22,7 +22,6 @@ import (
 	qmock "pkg.akt.dev/go/mocks/node/client"
 	certmocks "pkg.akt.dev/go/mocks/node/client/cert"
 	providermocks "pkg.akt.dev/go/mocks/node/client/provider"
-	dvbeta "pkg.akt.dev/go/node/deployment/v1beta4"
 	mtypes "pkg.akt.dev/go/node/market/v1"
 	providertypes "pkg.akt.dev/go/node/provider/v1beta4"
 	apclient "pkg.akt.dev/go/provider/client"
@@ -121,88 +120,6 @@ func Test_router_Status(t *testing.T) {
 	})
 }
 
-func Test_router_Validate(t *testing.T) {
-	t.Run("success", func(t *testing.T) {
-		expected := apclient.ValidateGroupSpecResult{
-			MinBidPrice: testutil.AkashDecCoin(t, 200),
-		}
-
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-
-		pkey := testutil.Key(t)
-		ckey := testutil.Key(t)
-		paddr := sdk.AccAddress(pkey.PubKey().Address())
-		caddr := sdk.AccAddress(ckey.PubKey().Address())
-
-		keys := []cryptotypes.PrivKey{
-			pkey, ckey,
-		}
-
-		mocks := createMocks()
-		mocks.pclient.On("Validate", mock.Anything, mock.Anything, mock.Anything).Return(expected, nil)
-
-		withServer(ctx, t, keys, mocks.pclient, mocks, func(host string, cquerier *certQuerier) {
-			cert := testutil.Certificate(t, caddr, testutil.CertificateOptionMocks(mocks.cmocks), testutil.CertificateOptionCache(cquerier))
-
-			client, err := apclient.NewClient(context.Background(), paddr, apclient.WithAuthCerts(cert.Cert), apclient.WithProviderURL(host), apclient.WithCertQuerier(cquerier))
-			assert.NoError(t, err)
-			result, err := client.Validate(context.Background(), testutil.GroupSpec(t))
-			assert.NoError(t, err)
-			assert.Equal(t, expected, result)
-
-			client, err = apclient.NewClient(context.Background(), paddr, apclient.WithAuthJWTSigner(&testJwtSigner{
-				key:  ckey,
-				addr: caddr,
-			}), apclient.WithProviderURL(host), apclient.WithCertQuerier(cquerier))
-			assert.NoError(t, err)
-			result, err = client.Validate(context.Background(), testutil.GroupSpec(t))
-			assert.NoError(t, err)
-			assert.Equal(t, expected, result)
-		})
-		mocks.pclient.AssertExpectations(t)
-	})
-
-	t.Run("failure", func(t *testing.T) {
-		pkey := testutil.Key(t)
-		ckey := testutil.Key(t)
-		paddr := sdk.AccAddress(pkey.PubKey().Address())
-		caddr := sdk.AccAddress(ckey.PubKey().Address())
-
-		keys := []cryptotypes.PrivKey{
-			pkey, ckey,
-		}
-
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-
-		mocks := createMocks()
-
-		mocks.pclient.On("Validate", mock.Anything, mock.Anything, mock.Anything).Return(apclient.ValidateGroupSpecResult{}, errors.New("oops"))
-		withServer(ctx, t, keys, mocks.pclient, mocks, func(host string, cquerier *certQuerier) {
-			cert := testutil.Certificate(t, caddr, testutil.CertificateOptionMocks(mocks.cmocks), testutil.CertificateOptionCache(cquerier))
-
-			client, err := apclient.NewClient(context.Background(), paddr, apclient.WithAuthCerts(cert.Cert), apclient.WithProviderURL(host), apclient.WithCertQuerier(cquerier))
-			assert.NoError(t, err)
-			_, err = client.Validate(context.Background(), dvbeta.GroupSpec{})
-			assert.Error(t, err)
-			_, err = client.Validate(context.Background(), testutil.GroupSpec(t))
-			assert.Error(t, err)
-
-			client, err = apclient.NewClient(context.Background(), paddr, apclient.WithAuthJWTSigner(&testJwtSigner{
-				key:  ckey,
-				addr: caddr,
-			}), apclient.WithProviderURL(host), apclient.WithCertQuerier(cquerier))
-			assert.NoError(t, err)
-			_, err = client.Validate(context.Background(), dvbeta.GroupSpec{})
-			assert.Error(t, err)
-			_, err = client.Validate(context.Background(), testutil.GroupSpec(t))
-			assert.Error(t, err)
-		})
-		mocks.pclient.AssertExpectations(t)
-	})
-}
-
 func Test_router_Manifest(t *testing.T) {
 	t.Run("success", func(t *testing.T) {
 		pkey := testutil.Key(t)

gateway/rest/router.go

@@ -23,7 +23,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	manifest "pkg.akt.dev/go/manifest/v2beta3"
-	dvbeta "pkg.akt.dev/go/node/deployment/v1beta4"
 	mtypes "pkg.akt.dev/go/node/market/v1"
 	apclient "pkg.akt.dev/go/provider/client"
 	ajwt "pkg.akt.dev/go/util/jwt"
@@ -111,19 +110,7 @@ func newRouter(log log.Logger, addr sdk.Address, pclient provider.Client, ctxCon
 		authorizeProviderMiddleware,
 		requireOwner,
 	)
-
-	// GET /validate
-	// validate endpoint checks if provider will bid on given groupspec
-	authedRouter.HandleFunc("/validate",
-		validateHandler(log, pclient)).
-		Methods("GET")
-
-	// GET /wiboy (aka would I bid on you)
-	// validate endpoint checks if the provider will bid on a given groupspec
-	authedRouter.HandleFunc("/wiboy",
-		validateHandler(log, pclient)).
-		Methods("GET")
-
+	
 	hostnameRouter := authedRouter.PathPrefix(apclient.HostnamePrefix).Subrouter()
 	hostnameRouter.HandleFunc(apclient.MigratePathPrefix,
 		migrateHandler(log, pclient.Hostname(), pclient.ClusterService())).
@@ -448,37 +435,6 @@ func createStatusHandler(log log.Logger, sclient provider.StatusClient, provider
 	}
 }
 
-func validateHandler(log log.Logger, cl provider.ValidateClient) http.HandlerFunc {
-	return func(w http.ResponseWriter, req *http.Request) {
-		data, err := io.ReadAll(req.Body)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		if len(data) == 0 {
-			http.Error(w, "empty payload", http.StatusBadRequest)
-			return
-		}
-
-		owner := requestOwner(req)
-
-		var gspec dvbeta.GroupSpec
-
-		if err := json.Unmarshal(data, &gspec); err != nil {
-			http.Error(w, err.Error(), http.StatusUnprocessableEntity)
-			return
-		}
-
-		validate, err := cl.Validate(req.Context(), owner, gspec)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusInternalServerError)
-			return
-		}
-		writeJSON(log, w, validate)
-	}
-}
-
 func createManifestHandler(log log.Logger, mclient pmanifest.Client) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
 		var mani manifest.Manifest

gateway/rest/router_test.go

@@ -451,115 +451,6 @@ func TestRouteStatusFails(t *testing.T) {
 	})
 }
 
-func TestRouteValidateOK(t *testing.T) {
-	runRouterTest(t, []routerTestAuth{routerTestAuthCert, routerTestAuthJWT}, func(test *routerTest, hdr http.Header) {
-		validate := apclient.ValidateGroupSpecResult{
-			MinBidPrice: testutil.AkashDecCoin(t, 200),
-		}
-
-		test.pclient.On("Validate", mock.Anything, mock.Anything, mock.Anything).Return(validate, nil)
-
-		uri, err := apclient.MakeURI(test.host, apclient.ValidatePath())
-		require.NoError(t, err)
-
-		gspec := testutil.GroupSpec(t)
-		bgspec, err := json.Marshal(&gspec)
-		require.NoError(t, err)
-
-		req, err := http.NewRequest("GET", uri, bytes.NewReader(bgspec))
-		require.NoError(t, err)
-		req.Header = hdr
-
-		req.Header.Set("Content-Type", contentTypeJSON)
-
-		rCl := test.gwclient.NewReqClient(context.Background())
-		resp, err := rCl.Do(req)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-		data := make(map[string]interface{})
-		decoder := json.NewDecoder(resp.Body)
-		err = decoder.Decode(&data)
-		require.NoError(t, err)
-	})
-}
-
-func TestRouteValidateUnauthorized(t *testing.T) {
-	runRouterTest(t, []routerTestAuth{}, func(test *routerTest, hdr http.Header) {
-		validate := apclient.ValidateGroupSpecResult{
-			MinBidPrice: testutil.AkashDecCoin(t, 200),
-		}
-
-		test.pclient.On("Validate", mock.Anything, mock.Anything, mock.Anything).Return(validate, nil)
-
-		uri, err := apclient.MakeURI(test.host, apclient.ValidatePath())
-		require.NoError(t, err)
-
-		gspec := testutil.GroupSpec(t)
-		bgspec, err := json.Marshal(&gspec)
-		require.NoError(t, err)
-
-		req, err := http.NewRequest("GET", uri, bytes.NewReader(bgspec))
-		require.NoError(t, err)
-		req.Header = hdr
-
-		req.Header.Set("Content-Type", contentTypeJSON)
-
-		rCl := test.gwclient.NewReqClient(context.Background())
-		resp, err := rCl.Do(req)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusUnauthorized, resp.StatusCode)
-	})
-}
-
-func TestRouteValidateFails(t *testing.T) {
-	runRouterTest(t, []routerTestAuth{routerTestAuthCert, routerTestAuthJWT}, func(test *routerTest, hdr http.Header) {
-		test.pclient.On("Validate", mock.Anything, mock.Anything, mock.Anything).Return(apclient.ValidateGroupSpecResult{}, errGeneric)
-
-		uri, err := apclient.MakeURI(test.host, apclient.ValidatePath())
-		require.NoError(t, err)
-
-		gspec := testutil.GroupSpec(t)
-		bgspec, err := json.Marshal(&gspec)
-		require.NoError(t, err)
-
-		req, err := http.NewRequest("GET", uri, bytes.NewReader(bgspec))
-		require.NoError(t, err)
-		req.Header = hdr
-
-		req.Header.Set("Content-Type", contentTypeJSON)
-		rCl := test.gwclient.NewReqClient(context.Background())
-		resp, err := rCl.Do(req)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusInternalServerError, resp.StatusCode)
-
-		data, err := io.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.Regexp(t, "^generic test error(?s:.)*$", string(data))
-	})
-}
-
-func TestRouteValidateFailsEmptyBody(t *testing.T) {
-	runRouterTest(t, []routerTestAuth{routerTestAuthCert, routerTestAuthJWT}, func(test *routerTest, hdr http.Header) {
-		test.pclient.On("Validate", mock.Anything, mock.Anything).Return(apclient.ValidateGroupSpecResult{}, errGeneric)
-
-		uri, err := apclient.MakeURI(test.host, apclient.ValidatePath())
-		require.NoError(t, err)
-
-		req, err := http.NewRequest("GET", uri, nil)
-		require.NoError(t, err)
-		req.Header = hdr
-		req.Header.Set("Content-Type", contentTypeJSON)
-		rCl := test.gwclient.NewReqClient(context.Background())
-		resp, err := rCl.Do(req)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
-
-		data, err := io.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.Regexp(t, "empty payload", string(data))
-	})
-}
-
 func TestRoutePutManifestOK(t *testing.T) {
 	runRouterTest(t, []routerTestAuth{routerTestAuthCert, routerTestAuthJWT}, func(test *routerTest, hdr http.Header) {
 		caddr := sdk.AccAddress(test.ckey.PubKey().Address())