Skip to content

Commit

Permalink
revert mock changes, more dev in db functions
Browse files Browse the repository at this point in the history
  • Loading branch information
temaniarpit27 committed Jan 21, 2025
1 parent c870c92 commit 0dd0939
Show file tree
Hide file tree
Showing 40 changed files with 100 additions and 85 deletions.
2 changes: 1 addition & 1 deletion agglayer/mock_agglayer_client.go

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

2 changes: 1 addition & 1 deletion aggoracle/mocks/mock_ethtxmanager.go

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

2 changes: 1 addition & 1 deletion aggoracle/mocks/mock_l2germanager.go

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

15 changes: 7 additions & 8 deletions aggsender/db/aggsender_db_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type AggSenderStorage interface {
// Add auth-proof in DB
AddAuthProof(ctx context.Context, authProof types.AuthProof) error
// Get auth-proof by identifier
GetAuthProof(identifier string) (*types.AuthProof, error)
GetAuthProof(endBlock uint64) (*types.AuthProof, error)
// Validate auth-proof
ValidateProof(req *types.ProofRequest) (bool, error)
}
Expand Down Expand Up @@ -87,25 +87,24 @@ func (a *AggSenderSQLStorage) AddAuthProof(ctx context.Context, authProof types.
}
}()

if _, err = tx.Exec(`INSERT INTO auth_proof (identifier, proof) VALUES ($1, $2);`,
authProof.Identifier, authProof.Proof); err != nil {
if _, err = tx.Exec(`INSERT INTO auth_proof (start_block, end_block, proof) VALUES ($1, $2, $3);`,
authProof.StartBlock, authProof.EndBlock, authProof.Proof); err != nil {
return fmt.Errorf("error inserting auth proof: %w", err)
}
if err = tx.Commit(); err != nil {
return err
}

a.logger.Debugf("inserted auth proof - Identifier: %s", authProof.Identifier)
a.logger.Debugf("inserted auth proof - start block: %d", authProof.StartBlock, "end block: %d", authProof.EndBlock)

return nil
}

func (a *AggSenderSQLStorage) GetAuthProof(identifier string) (*types.AuthProof, error) {
func (a *AggSenderSQLStorage) GetAuthProof(endBlock uint64) (*types.AuthProof, error) {
var authProof types.AuthProof
if err := meddler.QueryRow(a.db, &authProof,
"SELECT * FROM auth_proof WHERE identifier = $1;", identifier); err != nil {
// Fix this
return nil, getSelectQueryError(0, err)
"SELECT * FROM auth_proof WHERE start_block = $1;", endBlock); err != nil {
return nil, getSelectQueryError(endBlock, err)
}

return &authProof, nil
Expand Down
3 changes: 2 additions & 1 deletion aggsender/db/aggsender_db_storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ func TestValidateProof(t *testing.T) {

t.Run("ValidateProof", func(t *testing.T) {
mockProofRequest := &types.ProofRequest{
Identifier: "identifier",
StartBlock: 0,
EndBlock: 1,
Proof: "proof",
}
valid, err := storage.ValidateProof(mockProofRequest)
Expand Down
7 changes: 5 additions & 2 deletions aggsender/db/migrations/0002.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ DROP TABLE IF EXISTS auth_proof;

-- +migrate Up
CREATE TABLE auth_proof (
indentifier VARCHAR,
start_block INTEGER NOT NULL,
end_block INTEGER NOT NULL,
proof VARCHAR,
PRIMARY KEY (indentifier)
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL,
PRIMARY KEY (start_block, end_block)
);
4 changes: 2 additions & 2 deletions aggsender/grpc/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
)

func (s *server) ReceiveAuthProof(ctx context.Context, req *types.ProofRequest) (*types.ProofResponse, error) {
// Implement your logic here
log.Printf("Received proof: %v", req)
valid, err := s.aggsenderStorage.ValidateProof(req)
if err != nil {
Expand All @@ -24,7 +23,8 @@ func (s *server) ReceiveAuthProof(ctx context.Context, req *types.ProofRequest)
log.Printf("Proof is valid")
err = s.aggsenderStorage.AddAuthProof(context.Background(), types.AuthProof{
Proof: req.Proof,
Identifier: req.Identifier,
StartBlock: req.StartBlock,
EndBlock: req.EndBlock,
})
if err != nil {
log.Printf("Error adding proof: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion aggsender/mocks/mock_agg_sender_client.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_agg_sender_server.go

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

32 changes: 16 additions & 16 deletions aggsender/mocks/mock_agg_sender_storage.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_aggsender_interface.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_aggsender_storer.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_block_notifier.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_epoch_notifier.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_eth_client.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_generic_subscriber.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_l1_info_tree_syncer.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_l2_bridge_syncer.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_logger.go

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

2 changes: 1 addition & 1 deletion aggsender/mocks/mock_unsafe_agg_sender_server.go

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

5 changes: 3 additions & 2 deletions aggsender/proto/aggsender.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ package types;
option go_package = "github.com/agglayer/aggkit/aggsender/types";

message ProofRequest {
string identifier = 1;
string proof = 2;
uint64 start_block = 1;
uint64 end_block = 2;
string proof = 3;
}

message ProofResponse {
Expand Down
52 changes: 31 additions & 21 deletions aggsender/types/aggsender.pb.go

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

3 changes: 2 additions & 1 deletion aggsender/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ type Logger interface {
}

type AuthProof struct {
Identifier string
StartBlock uint64
EndBlock uint64
Proof string
}

Expand Down
2 changes: 1 addition & 1 deletion bridgesync/mocks/mock_eth_clienter.go

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

2 changes: 1 addition & 1 deletion bridgesync/mocks/mock_reorg_detector.go

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

2 changes: 1 addition & 1 deletion l1infotreesync/mocks/mock_eth_clienter.go

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

2 changes: 1 addition & 1 deletion l1infotreesync/mocks/mock_reorg_detector.go

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

2 changes: 1 addition & 1 deletion reorgdetector/mock_eth_client.go

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

2 changes: 1 addition & 1 deletion rpc/mocks/mock_bridge_client_interface.go

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

2 changes: 1 addition & 1 deletion rpc/mocks/mock_bridger.go

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

2 changes: 1 addition & 1 deletion rpc/mocks/mock_claim_sponsorer.go

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

2 changes: 1 addition & 1 deletion rpc/mocks/mock_client_factory_interface.go

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

Loading

0 comments on commit 0dd0939

Please sign in to comment.