all: rename sync protocol snap -> parallax-snap

Author: andrepatta

cmd/devp2p/internal/prltest/helpers.go

@@ -104,7 +104,7 @@ func (s *Suite) dialSnap() (*Conn, error) {
 	if err != nil {
 		return nil, fmt.Errorf("dial failed: %v", err)
 	}
-	conn.caps = append(conn.caps, p2p.Cap{Name: "snap", Version: 1})
+	conn.caps = append(conn.caps, p2p.Cap{Name: "parallax-snap", Version: 1})
 	conn.ourHighestSnapProtoVersion = 1
 	return conn, nil
 }
@@ -167,7 +167,7 @@ func (c *Conn) negotiateParallaxProtocol(caps []p2p.Cap) {
 			if capability.Version > highestParallaxVersion && capability.Version <= c.ourHighestProtoVersion {
 				highestParallaxVersion = capability.Version
 			}
-		case "snap":
+		case "parallax-snap":
 			if capability.Version > highestSnapVersion && capability.Version <= c.ourHighestSnapProtoVersion {
 				highestSnapVersion = capability.Version
 			}

cmd/devp2p/nodesetcmd.go

@@ -263,7 +263,7 @@ func snapFilter(args []string) (nodeFilter, error) {
 		var snap struct {
 			Tail []rlp.RawValue `rlp:"tail"`
 		}
-		return n.N.Load(enr.WithEntry("snap", &snap)) == nil
+		return n.N.Load(enr.WithEntry("parallax-snap", &snap)) == nil
 	}
 	return f, nil
 }

cmd/utils/flags.go

@@ -205,7 +205,7 @@ var (
 	defaultSyncMode = prlconfig.Defaults.SyncMode
 	SyncModeFlag    = TextMarshalerFlag{
 		Name:  "syncmode",
-		Usage: `Blockchain sync mode ("snap", "full" or "light")`,
+		Usage: `Blockchain sync mode ("parallax-snap", "full" or "light")`,
 		Value: &defaultSyncMode,
 	}
 	GCModeFlag = cli.StringFlag{

les/downloader/modes.go

@@ -41,7 +41,7 @@ func (mode SyncMode) String() string {
 	case FastSync:
 		return "fast"
 	case SnapSync:
-		return "snap"
+		return "parallax-snap"
 	case LightSync:
 		return "light"
 	default:
@@ -56,7 +56,7 @@ func (mode SyncMode) MarshalText() ([]byte, error) {
 	case FastSync:
 		return []byte("fast"), nil
 	case SnapSync:
-		return []byte("snap"), nil
+		return []byte("parallax-snap"), nil
 	case LightSync:
 		return []byte("light"), nil
 	default:
@@ -70,7 +70,7 @@ func (mode *SyncMode) UnmarshalText(text []byte) error {
 		*mode = FullSync
 	case "fast":
 		*mode = FastSync
-	case "snap":
+	case "parallax-snap":
 		*mode = SnapSync
 	case "light":
 		*mode = LightSync

prl/downloader/downloader.go

@@ -1189,7 +1189,7 @@ func (d *Downloader) processHeaders(origin uint64, td *big.Int) error {
 			}
 			log.Warn("Rolled back chain segment",
 				"header", fmt.Sprintf("%d->%d", lastHeader, d.lightchain.CurrentHeader().Number),
-				"snap", fmt.Sprintf("%d->%d", lastFastBlock, curFastBlock),
+				"parallax-snap", fmt.Sprintf("%d->%d", lastFastBlock, curFastBlock),
 				"block", fmt.Sprintf("%d->%d", lastBlock, curBlock), "reason", rollbackErr)
 		}
 	}()

prl/downloader/modes.go

@@ -38,7 +38,7 @@ func (mode SyncMode) String() string {
 	case FullSync:
 		return "full"
 	case SnapSync:
-		return "snap"
+		return "parallax-snap"
 	case LightSync:
 		return "light"
 	default:
@@ -51,7 +51,7 @@ func (mode SyncMode) MarshalText() ([]byte, error) {
 	case FullSync:
 		return []byte("full"), nil
 	case SnapSync:
-		return []byte("snap"), nil
+		return []byte("parallax-snap"), nil
 	case LightSync:
 		return []byte("light"), nil
 	default:
@@ -63,12 +63,12 @@ func (mode *SyncMode) UnmarshalText(text []byte) error {
 	switch string(text) {
 	case "full":
 		*mode = FullSync
-	case "snap":
+	case "parallax-snap":
 		*mode = SnapSync
 	case "light":
 		*mode = LightSync
 	default:
-		return fmt.Errorf(`unknown sync mode %q, want "full", "snap" or "light"`, text)
+		return fmt.Errorf(`unknown sync mode %q, want "full", "parallax-snap" or "light"`, text)
 	}
 	return nil
 }

prl/handler.go

@@ -445,7 +445,7 @@ func (h *handler) unregisterPeer(id string) {
 		return
 	}
 	// Remove the `parallax` peer if it exists
-	logger.Debug("Removing Parallax peer", "snap", peer.snapExt != nil)
+	logger.Debug("Removing Parallax peer", "parallax-snap", peer.snapExt != nil)
 
 	// Remove the `snap` extension if it exists
 	if peer.snapExt != nil {

prl/protocols/snap/discovery.go

@@ -28,5 +28,5 @@ type enrEntry struct {
 
 // ENRKey implements enr.Entry.
 func (e enrEntry) ENRKey() string {
-	return "snap"
+	return "parallax-snap"
 }

prl/protocols/snap/protocol.go

@@ -32,7 +32,7 @@ const (
 
 // ProtocolName is the official short name of the `snap` protocol used during
 // devp2p capability negotiation.
-const ProtocolName = "snap"
+const ProtocolName = "parallax-snap"
 
 // ProtocolVersions are the supported versions of the `snap` protocol (first
 // is primary).

prl/protocols/snap/sync.go

@@ -462,7 +462,7 @@ func NewSyncer(db prldb.KeyValueStore) *Syncer {
 		peers:    make(map[string]SyncPeer),
 		peerJoin: new(event.Feed),
 		peerDrop: new(event.Feed),
-		rates:    msgrate.NewTrackers(log.New("proto", "snap")),
+		rates:    msgrate.NewTrackers(log.New("proto", "parallax-snap")),
 		update:   make(chan struct{}, 1),
 
 		accountIdlers:  make(map[string]struct{}),