remove types of zos4

Author: Eslam-Nawara

go.mod

@@ -164,5 +164,3 @@ require (
 )
 
 replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
-
-replace github.com/threefoldtech/zosbase => ../zosbase

pkg/registrar_gateway.go

@@ -6,7 +6,6 @@ import (
 	substrateTypes "github.com/centrifuge/go-substrate-rpc-client/v4/types"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client"
-	"github.com/threefoldtech/zos4/pkg/types"
 	"github.com/threefoldtech/zosbase/pkg"
 )
 
@@ -18,11 +17,11 @@ type RegistrarGateway interface {
 	GetTwin(id uint64) (client.Account, error)
 	GetTwinByPubKey(pk []byte) (uint64, error)
 
-	CreateNode(node types.UpdateNodeRequest) (uint64, error)
+	CreateNode(node client.Node) (uint64, error)
 	GetNode(id uint64) (client.Node, error)
 	GetNodes(farmID uint64) ([]uint64, error)
 	GetNodeByTwinID(twin uint64) (client.Node, error)
-	UpdateNode(node types.UpdateNodeRequest) error
+	UpdateNode(node client.Node) error
 	UpdateNodeUptimeV2(uptime time.Duration, timestamp time.Time) (err error)
 
 	GetFarm(id uint64) (client.Farm, error)

pkg/registrar_gateway/registrar_gateway.go

@@ -17,7 +17,6 @@ import (
 	"github.com/threefoldtech/zbus"
 	zos4Pkg "github.com/threefoldtech/zos4/pkg"
 	"github.com/threefoldtech/zos4/pkg/stubs"
-	"github.com/threefoldtech/zos4/pkg/types"
 	"github.com/threefoldtech/zosbase/pkg"
 	"github.com/threefoldtech/zosbase/pkg/environment"
 )
@@ -62,7 +61,7 @@ func (r *registrarGateway) GetZosVersion() (client.ZosVersion, error) {
 	return r.registrarClient.GetZosVersion()
 }
 
-func (r *registrarGateway) CreateNode(node types.UpdateNodeRequest) (uint64, error) {
+func (r *registrarGateway) CreateNode(node client.Node) (uint64, error) {
 	log.Debug().
 		Str("method", "CreateNode").
 		Uint32("farm_id", uint32(node.FarmID)).
@@ -162,7 +161,7 @@ func (r *registrarGateway) GetTwinByPubKey(pk []byte) (result uint64, err error)
 	return account.TwinID, err
 }
 
-func (r *registrarGateway) UpdateNode(node types.UpdateNodeRequest) error {
+func (r *registrarGateway) UpdateNode(node client.Node) error {
 	log.Debug().
 		Str("method", "UpdateNode").
 		Uint64("twin_id", node.TwinID).

pkg/registrar_light/register.go

@@ -12,7 +12,6 @@ import (
 	"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client"
 	"github.com/threefoldtech/zbus"
 	zos4Stubs "github.com/threefoldtech/zos4/pkg/stubs"
-	"github.com/threefoldtech/zos4/pkg/types"
 	"github.com/threefoldtech/zosbase/pkg/environment"
 	"github.com/threefoldtech/zosbase/pkg/geoip"
 	gridtypes "github.com/threefoldtech/zosbase/pkg/gridtypes"
@@ -158,22 +157,11 @@ func registerNode(
 		SerialNumber: serial,
 	}
 
-	req := types.UpdateNodeRequest{
-		TwinID:       real.TwinID,
-		FarmID:       real.FarmID,
-		Resources:    real.Resources,
-		Location:     real.Location,
-		Interfaces:   real.Interfaces,
-		SecureBoot:   real.SecureBoot,
-		Virtualized:  real.Virtualized,
-		SerialNumber: real.SerialNumber,
-	}
-
 	node, regErr := registrarGateway.GetNodeByTwinID(ctx, twinID)
 	nodeID = node.NodeID
 	if regErr != nil {
 		if strings.Contains(regErr.Error(), client.ErrorNodeNotFround.Error()) {
-			nodeID, err = registrarGateway.CreateNode(ctx, req)
+			nodeID, err = registrarGateway.CreateNode(ctx, real)
 			if err != nil {
 				return 0, 0, errors.Wrap(err, "failed to create node on registrar")
 			}
@@ -202,7 +190,7 @@ func registerNode(
 
 	if !reflect.DeepEqual(real, onRegistrar) {
 		log.Debug().Msgf("node data have changed, issuing an update node real: %+v\nonRegistrar: %+v", real, onRegistrar)
-		err := registrarGateway.UpdateNode(ctx, req)
+		err := registrarGateway.UpdateNode(ctx, real)
 		if err != nil {
 			return 0, 0, errors.Wrapf(err, "failed to update node data with id: %d", nodeID)
 		}

pkg/stubs/registrar-gateway.go

@@ -6,11 +6,10 @@ package stubs
 
 import (
 	"context"
-	types1 "github.com/centrifuge/go-substrate-rpc-client/v4/types"
+	types "github.com/centrifuge/go-substrate-rpc-client/v4/types"
 	tfchainclientgo "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
 	client "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/client"
 	zbus "github.com/threefoldtech/zbus"
-	types "github.com/threefoldtech/zos4/pkg/types"
 	pkg "github.com/threefoldtech/zosbase/pkg"
 	"time"
 )
@@ -32,7 +31,7 @@ func NewRegistrarGatewayStub(client zbus.Client) *RegistrarGatewayStub {
 	}
 }
 
-func (s *RegistrarGatewayStub) CreateNode(ctx context.Context, arg0 types.UpdateNodeRequest) (ret0 uint64, ret1 error) {
+func (s *RegistrarGatewayStub) CreateNode(ctx context.Context, arg0 client.Node) (ret0 uint64, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "CreateNode", args...)
 	if err != nil {
@@ -168,7 +167,7 @@ func (s *RegistrarGatewayStub) GetNodeByTwinID(ctx context.Context, arg0 uint64)
 	return
 }
 
-func (s *RegistrarGatewayStub) GetNodeContracts(ctx context.Context, arg0 uint32) (ret0 []types1.U64, ret1 error) {
+func (s *RegistrarGatewayStub) GetNodeContracts(ctx context.Context, arg0 uint32) (ret0 []types.U64, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "GetNodeContracts", args...)
 	if err != nil {
@@ -304,7 +303,7 @@ func (s *RegistrarGatewayStub) GetZosVersion(ctx context.Context) (ret0 client.Z
 	return
 }
 
-func (s *RegistrarGatewayStub) Report(ctx context.Context, arg0 []tfchainclientgo.NruConsumption) (ret0 types1.Hash, ret1 error) {
+func (s *RegistrarGatewayStub) Report(ctx context.Context, arg0 []tfchainclientgo.NruConsumption) (ret0 types.Hash, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "Report", args...)
 	if err != nil {
@@ -339,7 +338,7 @@ func (s *RegistrarGatewayStub) SetContractConsumption(ctx context.Context, arg0
 	return
 }
 
-func (s *RegistrarGatewayStub) SetNodePowerState(ctx context.Context, arg0 bool) (ret0 types1.Hash, ret1 error) {
+func (s *RegistrarGatewayStub) SetNodePowerState(ctx context.Context, arg0 bool) (ret0 types.Hash, ret1 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "SetNodePowerState", args...)
 	if err != nil {
@@ -356,7 +355,7 @@ func (s *RegistrarGatewayStub) SetNodePowerState(ctx context.Context, arg0 bool)
 	return
 }
 
-func (s *RegistrarGatewayStub) UpdateNode(ctx context.Context, arg0 types.UpdateNodeRequest) (ret0 error) {
+func (s *RegistrarGatewayStub) UpdateNode(ctx context.Context, arg0 client.Node) (ret0 error) {
 	args := []interface{}{arg0}
 	result, err := s.client.RequestContext(ctx, s.module, s.object, "UpdateNode", args...)
 	if err != nil {