Resolve cyclic dependency in intents package

intents/packets/send_transaction_test.go → intents/intent_send_transaction_test.go

@@ -1,4 +1,4 @@
-package packets
+package intents
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/go-sequence"
-	"github.com/0xsequence/go-sequence/intents"
+	"github.com/0xsequence/go-sequence/intents/packets"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -90,7 +90,7 @@ func TestRecoverTransactionIntent(t *testing.T) {
 		]
 	}`
 
-	intent := &intents.Intent{}
+	intent := &Intent{}
 	err := json.Unmarshal([]byte(data), intent)
 	assert.Nil(t, err)
 
@@ -105,8 +105,8 @@ func TestRecoverTransactionIntent(t *testing.T) {
 	assert.Equal(t, 1, len(signers))
 	assert.Equal(t, "0x1111BD4F3233e7a7f552AdAf32C910fD30de598B", signers[0])
 
-	packet := &SendTransactionsPacket{}
-	err = packet.Unmarshal(intent)
+	packet := &packets.SendTransactionsPacket{}
+	err = packet.Unmarshal(intent.Packet)
 	assert.Nil(t, err)
 
 	assert.Equal(t, "sendTransaction", packet.Code)

intents/packets/sign_message_test.go → intents/intent_sign_message_test.go

@@ -1,4 +1,4 @@
-package packets
+package intents
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/go-sequence"
-	"github.com/0xsequence/go-sequence/intents"
+	"github.com/0xsequence/go-sequence/intents/packets"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -28,7 +28,7 @@ func TestRecoverMessageIntent(t *testing.T) {
 		}]
 	}`
 
-	intent := &intents.Intent{}
+	intent := &Intent{}
 	err := json.Unmarshal([]byte(data), intent)
 	assert.Nil(t, err)
 
@@ -43,8 +43,8 @@ func TestRecoverMessageIntent(t *testing.T) {
 	assert.Equal(t, 1, len(signers))
 	assert.Equal(t, "0x1111BD4F3233e7a7f552AdAf32C910fD30de598B", signers[0])
 
-	packet := &SignMessagePacket{}
-	err = packet.Unmarshal(intent)
+	packet := &packets.SignMessagePacket{}
+	err = packet.Unmarshal(intent.Packet)
 	assert.Nil(t, err)
 
 	assert.Equal(t, "signMessage", packet.Code)

intents/packets/close_session.go

@@ -3,8 +3,6 @@ package packets
 import (
 	"encoding/json"
 	"fmt"
-
-	"github.com/0xsequence/go-sequence/intents"
 )
 
 type CloseSessionPacket struct {
@@ -14,8 +12,8 @@ type CloseSessionPacket struct {
 
 const CloseSessionPacketCode = "closeSession"
 
-func (p *CloseSessionPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *CloseSessionPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}

intents/packets/finish_validate_session.go

@@ -3,8 +3,6 @@ package packets
 import (
 	"encoding/json"
 	"fmt"
-
-	"github.com/0xsequence/go-sequence/intents"
 )
 
 type FinishValidateSessionPacket struct {
@@ -16,8 +14,8 @@ type FinishValidateSessionPacket struct {
 
 const FinishValidateSessionPacketCode = "finishValidateSession"
 
-func (p *FinishValidateSessionPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *FinishValidateSessionPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}

intents/packets/open_session.go

@@ -3,8 +3,6 @@ package packets
 import (
 	"encoding/json"
 	"fmt"
-
-	"github.com/0xsequence/go-sequence/intents"
 )
 
 type OpenSessionPacket struct {
@@ -20,8 +18,8 @@ type OpenSessionPacketProof struct {
 
 const OpenSessionPacketCode = "openSession"
 
-func (p *OpenSessionPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *OpenSessionPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}

intents/packets/send_transaction.go

@@ -10,7 +10,6 @@ import (
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/ethkit/go-ethereum/core/types"
 	"github.com/0xsequence/go-sequence"
-	"github.com/0xsequence/go-sequence/intents"
 	"github.com/0xsequence/go-sequence/relayer/proto"
 )
 
@@ -24,8 +23,8 @@ type SendTransactionsPacket struct {
 
 const SendTransactionCode = "sendTransaction"
 
-func (p *SendTransactionsPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *SendTransactionsPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}

intents/packets/sign_message.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/go-sequence"
-	"github.com/0xsequence/go-sequence/intents"
 )
 
 type SignMessagePacket struct {
@@ -19,8 +18,8 @@ type SignMessagePacket struct {
 
 const SignMessagePacketCode = "signMessage"
 
-func (p *SignMessagePacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *SignMessagePacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}

intents/packets/validate_session.go

@@ -3,8 +3,6 @@ package packets
 import (
 	"encoding/json"
 	"fmt"
-
-	"github.com/0xsequence/go-sequence/intents"
 )
 
 type ValidateSessionPacket struct {
@@ -16,8 +14,8 @@ type ValidateSessionPacket struct {
 
 const ValidateSessionPacketCode = "validateSession"
 
-func (p *ValidateSessionPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *ValidateSessionPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}
@@ -47,8 +45,8 @@ type GetSessionPacket struct {
 	Session string `json:"session"`
 }
 
-func (p *GetSessionPacket) Unmarshal(i *intents.Intent) error {
-	err := json.Unmarshal(i.Packet, &p)
+func (p *GetSessionPacket) Unmarshal(packet json.RawMessage) error {
+	err := json.Unmarshal(packet, &p)
 	if err != nil {
 		return err
 	}