Fix lib

Author: johnfercher

go.mod

@@ -1,22 +1,12 @@
-module talescoder
+module talescoder/m/v2
 
 go 1.20
 
-require (
-	github.com/johnfercher/taleslab v0.0.0-20230830025129-bb8e8f444e70
-	github.com/stretchr/testify v1.8.4
-	go.uber.org/fx v1.20.0
-)
+require github.com/stretchr/testify v1.8.4
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/dig v1.17.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,23 +1,19 @@
 package mocks
 
-import (
-	"github.com/johnfercher/taleslab/pkg/taleslab/taleslabdomain/taleslabconsts"
-	"github.com/johnfercher/taleslab/pkg/taleslab/taleslabdomain/taleslabentities"
-	models2 "talescoder/pkg/models"
-)
+import "talescoder/m/v2/pkg/models"
 
-func CreateTaleSpireSlab() *models2.Slab {
-	return &models2.Slab{
-		MagicBytes:  taleslabconsts.MagicBytes,
+func CreateTaleSpireSlab() *models.Slab {
+	return &models.Slab{
+		MagicBytes:  models.MagicBytes,
 		Version:     2,
 		AssetsCount: 1,
-		Assets: []*models2.Asset{
+		Assets: []*models.Asset{
 			{
 				Id:           []byte{0x0, 0x0, 0x2c, 0x3e, 0x77, 0x5d, 0x2f, 0xca, 0x44, 0x4c, 0x88, 0xd0, 0xf9, 0xb4, 0xa7, 0xaf, 0xaf, 0x5a},
 				LayoutsCount: 1,
-				Layouts: []*models2.Layout{
+				Layouts: []*models.Layout{
 					{
-						Coordinates: &models2.Vector3d{
+						Coordinates: &models.Vector3d{
 							X: 0,
 							Y: 0,
 							Z: 0,
@@ -33,21 +29,3 @@ func CreateTaleSpireSlab() *models2.Slab {
 func CreateBase64Slab() string {
 	return "H4sIAAAAAAAE/wAoANf/zvrO0QIAAQAAACw+d10vykRMiND5tKevr1oBAAAAAAAAAAAAAAAAAAEAAP//7YI+iCgAAAA="
 }
-
-func CreateAssets() taleslabentities.Assets {
-	assets := taleslabentities.Assets{}
-
-	asset := &taleslabentities.Asset{
-		Id: []byte{0x0, 0x0, 0x2c, 0x3e, 0x77, 0x5d, 0x2f, 0xca, 0x44, 0x4c, 0x88, 0xd0, 0xf9, 0xb4, 0xa7, 0xaf, 0xaf, 0x5a},
-		Coordinates: &taleslabentities.Vector3d{
-			X: 0,
-			Y: 0,
-			Z: 0,
-		},
-		Rotation: 0,
-	}
-
-	assets = append(assets, asset)
-
-	return assets
-}

mocks/slab.go

@@ -2,14 +2,14 @@ package decoder
 
 import (
 	"bufio"
-	"talescoder/internal/axisadapter"
-	"talescoder/internal/bytecompressor"
-	"talescoder/internal/byteparser"
-	models2 "talescoder/pkg/models"
+	"talescoder/m/v2/internal/axisadapter"
+	"talescoder/m/v2/internal/bytecompressor"
+	"talescoder/m/v2/internal/byteparser"
+	"talescoder/m/v2/pkg/models"
 )
 
 type Decoder interface {
-	Decode(slabBase64 string) (*models2.Slab, error)
+	Decode(slabBase64 string) (*models.Slab, error)
 }
 
 type decoder struct {
@@ -22,8 +22,8 @@ func NewDecoder(byteCompressor bytecompressor.ByteCompressor) Decoder {
 	}
 }
 
-func (self *decoder) Decode(slabBase64 string) (*models2.Slab, error) {
-	slab := &models2.Slab{}
+func (self *decoder) Decode(slabBase64 string) (*models.Slab, error) {
+	slab := &models.Slab{}
 
 	reader, err := self.slabCompressor.BufferFromBase64(slabBase64)
 	if err != nil {
@@ -83,7 +83,7 @@ func (self *decoder) Decode(slabBase64 string) (*models2.Slab, error) {
 	return slab, nil
 }
 
-func (self *decoder) decodeBounds(reader *bufio.Reader) (*models2.Layout, error) {
+func (self *decoder) decodeBounds(reader *bufio.Reader) (*models.Layout, error) {
 	centerX, err := byteparser.BufferToUint16(reader)
 	if err != nil {
 		return nil, err
@@ -104,8 +104,8 @@ func (self *decoder) decodeBounds(reader *bufio.Reader) (*models2.Layout, error)
 		return nil, err
 	}
 
-	return &models2.Layout{
-		Coordinates: &models2.Vector3d{
+	return &models.Layout{
+		Coordinates: &models.Vector3d{
 			X: axisadapter.DecodeX(centerX),
 			Y: axisadapter.DecodeY(centerY),
 			Z: axisadapter.DecodeZ(centerZ),
@@ -114,8 +114,8 @@ func (self *decoder) decodeBounds(reader *bufio.Reader) (*models2.Layout, error)
 	}, nil
 }
 
-func (self *decoder) decodeAsset(reader *bufio.Reader) (*models2.Asset, error) {
-	asset := &models2.Asset{}
+func (self *decoder) decodeAsset(reader *bufio.Reader) (*models.Asset, error) {
+	asset := &models.Asset{}
 
 	// Id
 	idBytes, err := byteparser.BufferToBytes(reader, 18)

pkg/decoder/decoder.go

@@ -3,11 +3,10 @@ package decoder
 import (
 	"errors"
 	"fmt"
-	"github.com/johnfercher/taleslab/mocks"
-	"github.com/johnfercher/taleslab/pkg/taleslab/taleslabdomain/taleslabconsts"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"talescoder/internal/bytecompressor"
+	"talescoder/m/v2/internal/bytecompressor"
+	"talescoder/m/v2/mocks"
 	"testing"
 )
 
@@ -55,7 +54,7 @@ func TestDecoder_Decode_IntegrationHappy(t *testing.T) {
 	// Assert
 	assert.Nil(t, err)
 	assert.NotNil(t, slab)
-	assert.Equal(t, taleslabconsts.MagicBytes, slab.MagicBytes)
+	assert.Equal(t, consts.MagicBytes, slab.MagicBytes)
 	assert.Equal(t, int16(2), slab.Version)
 	assert.Equal(t, int16(1), slab.AssetsCount)
 	assert.Equal(t, slab.AssetsCount, int16(len(slab.Assets)))

pkg/decoder/decoder_test.go

@@ -1,10 +1,10 @@
 package encoder
 
 import (
-	"talescoder/internal/axisadapter"
-	"talescoder/internal/bytecompressor"
-	"talescoder/internal/byteparser"
-	"talescoder/pkg/models"
+	"talescoder/m/v2/internal/axisadapter"
+	"talescoder/m/v2/internal/bytecompressor"
+	"talescoder/m/v2/internal/byteparser"
+	"talescoder/m/v2/pkg/models"
 )
 
 type Encoder interface {

pkg/encoder/encoder.go

@@ -3,8 +3,8 @@ package encoder
 import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"talescoder/internal/bytecompressor"
-	"talescoder/mocks"
+	"talescoder/m/v2/internal/bytecompressor"
+	"talescoder/m/v2/mocks"
 	"testing"
 )
 

pkg/encoder/encoder_test.go

@@ -0,0 +1,3 @@
+package models
+
+var MagicBytes = []byte{206, 250, 206, 209}