From bce022ea7a51006f330cd7c779e4138b72dd8cd3 Mon Sep 17 00:00:00 2001
From: Clement Sam <clementsam75@gmail.com>
Date: Wed, 18 Oct 2023 18:21:26 +0000
Subject: [PATCH] satellite/overlay: remove Type field from NodeDossier

The overlay.NodeDossier struct only tracks information about a
storagenode, the field is deprecated and no longer needed.
This is a kademlia left-over.

Updates https://github.com/storj/storj/issues/5426

Change-Id: Ie278ffd88d1b9a9fde6c81eb5f0e287bab8c9ef0
---
 satellite/overlay/service.go          | 1 -
 satellite/overlay/service_test.go     | 2 --
 satellite/satellitedb/overlaycache.go | 1 -
 3 files changed, 4 deletions(-)

diff --git a/satellite/overlay/service.go b/satellite/overlay/service.go
index 51290117e..1ab568ebb 100644
--- a/satellite/overlay/service.go
+++ b/satellite/overlay/service.go
@@ -242,7 +242,6 @@ type ExitStatusRequest struct {
 // NodeDossier is the complete info that the satellite tracks for a storage node.
 type NodeDossier struct {
 	pb.Node
-	Type                    pb.NodeType
 	Operator                pb.NodeOperator
 	Capacity                pb.NodeCapacity
 	Reputation              NodeStats
diff --git a/satellite/overlay/service_test.go b/satellite/overlay/service_test.go
index 91c6360ef..9e73282ec 100644
--- a/satellite/overlay/service_test.go
+++ b/satellite/overlay/service_test.go
@@ -371,7 +371,6 @@ func TestNodeInfo(t *testing.T) {
 
 		dossier := planet.StorageNodes[0].Contact.Service.Local()
 
-		assert.Equal(t, pb.NodeType_STORAGE, node.Type)
 		assert.NotEmpty(t, node.Operator.Email)
 		assert.NotEmpty(t, node.Operator.Wallet)
 		assert.Equal(t, dossier.Operator, node.Operator)
@@ -496,7 +495,6 @@ func TestUpdateCheckIn(t *testing.T) {
 					Address: info.Address.GetAddress(),
 				},
 			},
-			Type: pb.NodeType_STORAGE,
 			Operator: pb.NodeOperator{
 				Email:          info.Operator.GetEmail(),
 				Wallet:         info.Operator.GetWallet(),
diff --git a/satellite/satellitedb/overlaycache.go b/satellite/satellitedb/overlaycache.go
index 8e489c7f3..b73c0da58 100644
--- a/satellite/satellitedb/overlaycache.go
+++ b/satellite/satellitedb/overlaycache.go
@@ -1070,7 +1070,6 @@ func convertDBNode(ctx context.Context, info *dbx.Node) (_ *overlay.NodeDossier,
 				Features:      uint64(info.Features),
 			},
 		},
-		Type: pb.NodeType(info.Type),
 		Operator: pb.NodeOperator{
 			Email:          info.Email,
 			Wallet:         info.Wallet,