feat: packages reorganization

agglayer · Feb 19, 2025 · 4c4d487 · 4c4d487
1 parent 097b0a1
commit 4c4d487
Show file tree

Hide file tree

Showing 26 changed files with 429 additions and 417 deletions.
diff --git a/agglayer/client.go b/agglayer/client.go
@@ -9,7 +9,8 @@ import (
 	"time"
 
 	"github.com/0xPolygon/cdk-rpc/rpc"
-	"github.com/0xPolygon/cdk-rpc/types"
+	rpcTypes "github.com/0xPolygon/cdk-rpc/types"
+	"github.com/agglayer/aggkit/agglayer/types"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -21,20 +22,20 @@ var (
 )
 
 type AggLayerClientGetEpochConfiguration interface {
-	GetEpochConfiguration() (*ClockConfiguration, error)
+	GetEpochConfiguration() (*types.ClockConfiguration, error)
 }
 
 type AggLayerClientRecoveryQuerier interface {
-	GetLatestSettledCertificateHeader(networkID uint32) (*CertificateHeader, error)
-	GetLatestPendingCertificateHeader(networkID uint32) (*CertificateHeader, error)
+	GetLatestSettledCertificateHeader(networkID uint32) (*types.CertificateHeader, error)
+	GetLatestPendingCertificateHeader(networkID uint32) (*types.CertificateHeader, error)
 }
 
 // AgglayerClientInterface is the interface that defines the methods that the AggLayerClient will implement
 type AgglayerClientInterface interface {
 	SendTx(signedTx SignedTx) (common.Hash, error)
 	WaitTxToBeMined(hash common.Hash, ctx context.Context) error
-	SendCertificate(certificate *SignedCertificate) (common.Hash, error)
-	GetCertificateHeader(certificateHash common.Hash) (*CertificateHeader, error)
+	SendCertificate(certificate *types.SignedCertificate) (common.Hash, error)
+	GetCertificateHeader(certificateHash common.Hash) (*types.CertificateHeader, error)
 	AggLayerClientGetEpochConfiguration
 	AggLayerClientRecoveryQuerier
 }
@@ -65,7 +66,7 @@ func (c *AggLayerClient) SendTx(signedTx SignedTx) (common.Hash, error) {
 		return common.Hash{}, fmt.Errorf("%v %v", response.Error.Code, response.Error.Message)
 	}
 
-	var result types.ArgHash
+	var result rpcTypes.ArgHash
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return common.Hash{}, err
@@ -104,7 +105,7 @@ func (c *AggLayerClient) WaitTxToBeMined(hash common.Hash, ctx context.Context)
 }
 
 // SendCertificate sends a certificate to the AggLayer
-func (c *AggLayerClient) SendCertificate(certificate *SignedCertificate) (common.Hash, error) {
+func (c *AggLayerClient) SendCertificate(certificate *types.SignedCertificate) (common.Hash, error) {
 	certificateToSend := certificate.CopyWithDefaulting()
 
 	response, err := rpc.JSONRPCCall(c.url, "interop_sendCertificate", certificateToSend)
@@ -116,7 +117,7 @@ func (c *AggLayerClient) SendCertificate(certificate *SignedCertificate) (common
 		return common.Hash{}, fmt.Errorf("%d %s", response.Error.Code, response.Error.Message)
 	}
 
-	var result types.ArgHash
+	var result rpcTypes.ArgHash
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return common.Hash{}, err
@@ -126,7 +127,7 @@ func (c *AggLayerClient) SendCertificate(certificate *SignedCertificate) (common
 }
 
 // GetCertificateHeader returns the certificate header associated to the hash
-func (c *AggLayerClient) GetCertificateHeader(certificateHash common.Hash) (*CertificateHeader, error) {
+func (c *AggLayerClient) GetCertificateHeader(certificateHash common.Hash) (*types.CertificateHeader, error) {
 	response, err := rpc.JSONRPCCall(c.url, "interop_getCertificateHeader", certificateHash)
 	if err != nil {
 		return nil, err
@@ -136,7 +137,7 @@ func (c *AggLayerClient) GetCertificateHeader(certificateHash common.Hash) (*Cer
 		return nil, fmt.Errorf("%d %s", response.Error.Code, response.Error.Message)
 	}
 
-	var result *CertificateHeader
+	var result *types.CertificateHeader
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return nil, err
@@ -146,7 +147,7 @@ func (c *AggLayerClient) GetCertificateHeader(certificateHash common.Hash) (*Cer
 }
 
 // GetEpochConfiguration returns the clock configuration of AggLayer
-func (c *AggLayerClient) GetEpochConfiguration() (*ClockConfiguration, error) {
+func (c *AggLayerClient) GetEpochConfiguration() (*types.ClockConfiguration, error) {
 	response, err := jSONRPCCall(c.url, "interop_getEpochConfiguration")
 	if err != nil {
 		return nil, err
@@ -156,7 +157,7 @@ func (c *AggLayerClient) GetEpochConfiguration() (*ClockConfiguration, error) {
 		return nil, fmt.Errorf("GetEpochConfiguration code=%d msg=%s", response.Error.Code, response.Error.Message)
 	}
 
-	var result *ClockConfiguration
+	var result *types.ClockConfiguration
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return nil, err
@@ -165,7 +166,7 @@ func (c *AggLayerClient) GetEpochConfiguration() (*ClockConfiguration, error) {
 	return result, nil
 }
 
-func (c *AggLayerClient) GetLatestSettledCertificateHeader(networkID uint32) (*CertificateHeader, error) {
+func (c *AggLayerClient) GetLatestSettledCertificateHeader(networkID uint32) (*types.CertificateHeader, error) {
 	response, err := jSONRPCCall(c.url, "interop_getLatestSettledCertificateHeader", networkID)
 	if err != nil {
 		return nil, fmt.Errorf("interop_getLatestSettledCertificateHeader rpc call failed: %w", err)
@@ -176,7 +177,7 @@ func (c *AggLayerClient) GetLatestSettledCertificateHeader(networkID uint32) (*C
 			response.Error.Code, response.Error.Message)
 	}
 
-	var result *CertificateHeader
+	var result *types.CertificateHeader
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return nil, fmt.Errorf("GetLatestSettledCertificateHeader error Unmashal. Err: %w", err)
@@ -185,7 +186,7 @@ func (c *AggLayerClient) GetLatestSettledCertificateHeader(networkID uint32) (*C
 	return result, nil
 }
 
-func (c *AggLayerClient) GetLatestPendingCertificateHeader(networkID uint32) (*CertificateHeader, error) {
+func (c *AggLayerClient) GetLatestPendingCertificateHeader(networkID uint32) (*types.CertificateHeader, error) {
 	response, err := jSONRPCCall(c.url, "interop_getLatestPendingCertificateHeader", networkID)
 	if err != nil {
 		return nil, fmt.Errorf("interop_getLatestPendingCertificateHeader rpc call failed: %w", err)
@@ -196,7 +197,7 @@ func (c *AggLayerClient) GetLatestPendingCertificateHeader(networkID uint32) (*C
 			response.Error.Code, response.Error.Message)
 	}
 
-	var result *CertificateHeader
+	var result *types.CertificateHeader
 	err = json.Unmarshal(response.Result, &result)
 	if err != nil {
 		return nil, fmt.Errorf("GetLatestPendingCertificateHeader error Unmashal. Err: %w", err)

diff --git a/agglayer/client_test.go b/agglayer/client_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/0xPolygon/cdk-rpc/rpc"
+	"github.com/agglayer/aggkit/agglayer/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
@@ -100,7 +101,7 @@ func TestGetEpochConfigurationOkResponse(t *testing.T) {
 	clockConfig, err := sut.GetEpochConfiguration()
 	require.NotNil(t, clockConfig)
 	require.NoError(t, err)
-	require.Equal(t, ClockConfiguration{
+	require.Equal(t, types.ClockConfiguration{
 		EpochDuration: 1,
 		GenesisBlock:  1,
 	}, *clockConfig)

diff --git a/agglayer/mock_agglayer_client.go b/agglayer/mock_agglayer_client.go
diff --git a/agglayer/errors_test.go → agglayer/types/errors_test.go b/agglayer/errors_test.go → agglayer/types/errors_test.go
@@ -1,4 +1,4 @@
-package agglayer
+package types
 
 import (
 	"testing"

diff --git a/agglayer/types.go → agglayer/types/types.go b/agglayer/types.go → agglayer/types/types.go
@@ -1,4 +1,4 @@
-package agglayer
+package types
 
 import (
 	"encoding/json"