Skip to content

Commit

Permalink
rename grpc
Browse files Browse the repository at this point in the history
  • Loading branch information
temaniarpit27 committed Jan 29, 2025
1 parent d76b5ce commit 849e9d2
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 188 deletions.
6 changes: 3 additions & 3 deletions aggsender/grpc/aggchain_proof_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const TIMEOUT = 2

// AggchainProofClientInterface defines an interface for aggchain proof client
type AggchainProofClientInterface interface {
FetchAggchainProof(startBlock uint64, maxEndBlock uint64) (*types.AggchainProof, error)
GenerateAggchainProof(startBlock uint64, maxEndBlock uint64) (*types.AggchainProof, error)
}

// AggchainProofClient provides an implementation for the AggchainProofClient interface
Expand All @@ -30,11 +30,11 @@ func NewAggchainProofClient(serverAddr string) (*AggchainProofClient, error) {
}, nil
}

func (c *AggchainProofClient) FetchAggchainProof(startBlock uint64, maxEndBlock uint64) (*types.AggchainProof, error) {
func (c *AggchainProofClient) GenerateAggchainProof(startBlock uint64, maxEndBlock uint64) (*types.AggchainProof, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute*TIMEOUT)
defer cancel()

resp, err := c.client.FetchAggchainProof(ctx, &types.FetchAggchainProofRequest{
resp, err := c.client.GenerateAggchainProof(ctx, &types.GenerateAggchainProofRequest{
StartBlock: startBlock,
MaxEndBlock: maxEndBlock,
})
Expand Down
20 changes: 10 additions & 10 deletions aggsender/grpc/aggchain_proof_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ type MockAggchainProofServiceClient struct {
mock.Mock
}

func TestFetchAggchainProof_Success(t *testing.T) {
func TestGenerateAggchainProof_Success(t *testing.T) {
mockClient := mocks.NewAggchainProofServiceClient(t)
client := &AggchainProofClient{client: mockClient}

expectedResponse := &types.FetchAggchainProofResponse{
expectedResponse := &types.GenerateAggchainProofResponse{
AggchainProof: []byte("dummy-proof"),
StartBlock: 100,
EndBlock: 200,
}

mockClient.On("FetchAggchainProof", mock.Anything, &types.FetchAggchainProofRequest{
mockClient.On("GenerateAggchainProof", mock.Anything, &types.GenerateAggchainProofRequest{
StartBlock: 100,
MaxEndBlock: 200,
}).Return(expectedResponse, nil)

result, err := client.FetchAggchainProof(100, 200)
result, err := client.GenerateAggchainProof(100, 200)

assert.NoError(t, err)
assert.Equal(t, "dummy-proof", result.Proof)
Expand All @@ -39,21 +39,21 @@ func TestFetchAggchainProof_Success(t *testing.T) {
mockClient.AssertExpectations(t)
}

func TestFetchAggchainProof_Error(t *testing.T) {
func TestGenerateAggchainProof_Error(t *testing.T) {
mockClient := mocks.NewAggchainProofServiceClient(t)
client := &AggchainProofClient{client: mockClient}

expectedError := errors.New("fetch error")
expectedError := errors.New("Generate error")

mockClient.On("FetchAggchainProof", mock.Anything, &types.FetchAggchainProofRequest{
mockClient.On("GenerateAggchainProof", mock.Anything, &types.GenerateAggchainProofRequest{
StartBlock: 300,
MaxEndBlock: 400,
}).Return((*types.FetchAggchainProofResponse)(nil), expectedError)
}).Return((*types.GenerateAggchainProofResponse)(nil), expectedError)

result, err := client.FetchAggchainProof(300, 400)
result, err := client.GenerateAggchainProof(300, 400)

assert.Error(t, err)
assert.Nil(t, result)
assert.Equal(t, "fetch error", err.Error())
assert.Equal(t, "Generate error", err.Error())
mockClient.AssertExpectations(t)
}
36 changes: 18 additions & 18 deletions aggsender/mocks/mock_aggchain_proof_service_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions aggsender/mocks/mock_aggchain_proof_service_server.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions aggsender/proto/aggsender.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,27 @@ syntax = "proto3";
package types;
option go_package = "github.com/agglayer/aggkit/aggsender/types";

// Service for fetching aggchain proof.
// Service for generating aggchain proof.
service AggchainProofService {
// Fetches a aggchain-proof for a given start_block.
rpc FetchAggchainProof(FetchAggchainProofRequest) returns (FetchAggchainProofResponse);
// Generates a aggchain proof for a given start_block.
rpc GenerateAggchainProof(GenerateAggchainProofRequest) returns (GenerateAggchainProofResponse);
}

message FetchAggchainProofRequest {
// The request message for generating aggchain proof.
message GenerateAggchainProofRequest {
// The start block for which the aggchain proof is requested.
uint64 start_block = 1;
// The max end block for which the aggchain proof is requested.
uint64 max_end_block = 2;
}

message FetchAggchainProofResponse {
// The aggchain proof.
// The aggchain proof response message.
message GenerateAggchainProofResponse {
// TODO - Define the type of aggchain proof.
// The start block of the aggchain proof.
bytes aggchain_proof = 1;
// The start block of the aggchain proof.
uint64 start_block = 2;
// The end block of the aggchain proof.
uint64 end_block = 3;
}

// Error message returned when an error occurs during aggchain proof request.
message FetchAggchainProofError {
// The error message as bytes.
bytes error = 1;
// The kind of error that occurred.
// TODO - Define what kind of errors can occur.
// ErrorKind error_type = 2;
}
Loading

0 comments on commit 849e9d2

Please sign in to comment.