Treeless soft-state

.gitignore

@@ -4,3 +4,4 @@
 
 # Stuff from GitHub Pages
 docs/_site
+.jekyll-metadata

cmd/pineconesim/main.go

@@ -261,12 +261,9 @@ func userProxyReporter(conn *websocket.Conn, connID uint64, sim *simulator.Simul
 				AnnTime:     node.Announcement.Time,
 				Coords:      node.Coords,
 			},
-			Peers:         peerConns,
-			TreeParent:    node.Parent,
-			SnakeAsc:      node.AscendingPeer,
-			SnakeAscPath:  node.AscendingPathID,
-			SnakeDesc:     node.DescendingPeer,
-			SnakeDescPath: node.DescendingPathID,
+			Peers:      peerConns,
+			TreeParent: node.Parent,
+			SnakeDesc:  node.DescendingPeer,
 		}
 
 		if batchSize == int(maxBatchSize) || end {
@@ -351,8 +348,6 @@ func handleSimEvents(log *log.Logger, conn *websocket.Conn, ch <-chan simulator.
 			eventType = simulator.SimPeerRemoved
 		case simulator.TreeParentUpdate:
 			eventType = simulator.SimTreeParentUpdated
-		case simulator.SnakeAscUpdate:
-			eventType = simulator.SimSnakeAscUpdated
 		case simulator.SnakeDescUpdate:
 			eventType = simulator.SimSnakeDescUpdated
 		case simulator.TreeRootAnnUpdate:

cmd/pineconesim/simulator/adversary/drop_packets.go

@@ -86,13 +86,7 @@ func NewPacketsReceived() PacketsReceived {
 func defaultFrameCount() PeerFrameCount {
 	frameCount := make(FrameCounts, 9)
 	frameCount[types.TypeKeepalive] = atomic.NewUint64(0)
-	frameCount[types.TypeTreeAnnouncement] = atomic.NewUint64(0)
 	frameCount[types.TypeVirtualSnakeBootstrap] = atomic.NewUint64(0)
-	frameCount[types.TypeVirtualSnakeBootstrapACK] = atomic.NewUint64(0)
-	frameCount[types.TypeVirtualSnakeSetup] = atomic.NewUint64(0)
-	frameCount[types.TypeVirtualSnakeSetupACK] = atomic.NewUint64(0)
-	frameCount[types.TypeVirtualSnakeTeardown] = atomic.NewUint64(0)
-	frameCount[types.TypeTreeRouted] = atomic.NewUint64(0)
 	frameCount[types.TypeVirtualSnakeRouted] = atomic.NewUint64(0)
 
 	peerFrameCount := PeerFrameCount{
@@ -139,10 +133,6 @@ func (a *AdversaryRouter) Ping(ctx context.Context, addr net.Addr) (uint16, time
 	return 0, 0, nil
 }
 
-func (a *AdversaryRouter) Coords() types.Coordinates {
-	return a.rtr.Coords()
-}
-
 func (a *AdversaryRouter) ConfigureFilterDefaults(rates DropRates) {
 	a.dropSettings.overall = rates
 }

cmd/pineconesim/simulator/api.go

@@ -38,7 +38,6 @@ const (
 	SimPeerAdded
 	SimPeerRemoved
 	SimTreeParentUpdated
-	SimSnakeAscUpdated
 	SimSnakeDescUpdated
 	SimTreeRootAnnUpdated
 	SimPingStateUpdated
@@ -68,15 +67,12 @@ const (
 )
 
 type InitialNodeState struct {
-	PublicKey     string
-	NodeType      APINodeType
-	RootState     RootState
-	Peers         []PeerInfo
-	TreeParent    string
-	SnakeAsc      string
-	SnakeAscPath  string
-	SnakeDesc     string
-	SnakeDescPath string
+	PublicKey  string
+	NodeType   APINodeType
+	RootState  RootState
+	Peers      []PeerInfo
+	TreeParent string
+	SnakeDesc  string
 }
 
 type RootState struct {

cmd/pineconesim/simulator/commands.go

@@ -119,48 +119,12 @@ func UnmarshalCommandJSON(command *SimCommandMsg) (SimCommand, error) {
 			} else {
 				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.Keepalive field doesn't exist", FAILURE_PREAMBLE)
 			}
-			if subVal, subOk := val.(map[string]interface{})["TreeAnnouncement"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeTreeAnnouncement] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.TreeAnnouncement field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["TreeRouted"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeTreeRouted] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.TreeRouted field doesn't exist", FAILURE_PREAMBLE)
-			}
 			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeBootstrap"]; subOk {
 				intVal, _ := strconv.Atoi(subVal.(string))
 				dropRates.Frames[types.TypeVirtualSnakeBootstrap] = uint64(intVal)
 			} else {
 				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.VirtualSnakeBootstrap field doesn't exist", FAILURE_PREAMBLE)
 			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeBootstrapACK"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeBootstrapACK] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.VirtualSnakeBootstrapACK field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeSetup"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeSetup] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.VirtualSnakeSetup field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeSetupACK"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeSetupACK] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.VirtualSnakeSetupACK field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeTeardown"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeTeardown] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryDefaults.DropRates.VirtualSnakeTeardown field doesn't exist", FAILURE_PREAMBLE)
-			}
 			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeRouted"]; subOk {
 				intVal, _ := strconv.Atoi(subVal.(string))
 				dropRates.Frames[types.TypeVirtualSnakeRouted] = uint64(intVal)
@@ -199,48 +163,12 @@ func UnmarshalCommandJSON(command *SimCommandMsg) (SimCommand, error) {
 			} else {
 				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.Keepalive field doesn't exist", FAILURE_PREAMBLE)
 			}
-			if subVal, subOk := val.(map[string]interface{})["TreeAnnouncement"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeTreeAnnouncement] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.TreeAnnouncement field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["TreeRouted"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeTreeRouted] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.TreeRouted field doesn't exist", FAILURE_PREAMBLE)
-			}
 			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeBootstrap"]; subOk {
 				intVal, _ := strconv.Atoi(subVal.(string))
 				dropRates.Frames[types.TypeVirtualSnakeBootstrap] = uint64(intVal)
 			} else {
 				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.VirtualSnakeBootstrap field doesn't exist", FAILURE_PREAMBLE)
 			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeBootstrapACK"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeBootstrapACK] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.VirtualSnakeBootstrapACK field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeSetup"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeSetup] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.VirtualSnakeSetup field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeSetupACK"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeSetupACK] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.VirtualSnakeSetupACK field doesn't exist", FAILURE_PREAMBLE)
-			}
-			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeTeardown"]; subOk {
-				intVal, _ := strconv.Atoi(subVal.(string))
-				dropRates.Frames[types.TypeVirtualSnakeTeardown] = uint64(intVal)
-			} else {
-				err = fmt.Errorf("%sConfigureAdversaryPeer.DropRates.VirtualSnakeTeardown field doesn't exist", FAILURE_PREAMBLE)
-			}
 			if subVal, subOk := val.(map[string]interface{})["VirtualSnakeRouted"]; subOk {
 				intVal, _ := strconv.Atoi(subVal.(string))
 				dropRates.Frames[types.TypeVirtualSnakeRouted] = uint64(intVal)

cmd/pineconesim/simulator/events.go

@@ -62,21 +62,10 @@ type TreeParentUpdate struct {
 // Tag TreeParentUpdate as an Event
 func (e TreeParentUpdate) isEvent() {}
 
-type SnakeAscUpdate struct {
-	Node   string
-	Peer   string
-	Prev   string
-	PathID string
-}
-
-// Tag SnakeAscUpdate as an Event
-func (e SnakeAscUpdate) isEvent() {}
-
 type SnakeDescUpdate struct {
-	Node   string
-	Peer   string
-	Prev   string
-	PathID string
+	Node string
+	Peer string
+	Prev string
 }
 
 // Tag SnakeDescUpdate as an Event
@@ -129,10 +118,8 @@ func (h eventHandler) Run(quit <-chan bool, sim *Simulator) {
 				sim.handlePeerRemoved(h.node, e.PeerID, int(e.Port))
 			case events.TreeParentUpdate:
 				sim.handleTreeParentUpdate(h.node, e.PeerID)
-			case events.SnakeAscUpdate:
-				sim.handleSnakeAscUpdate(h.node, e.PeerID, e.PathID)
 			case events.SnakeDescUpdate:
-				sim.handleSnakeDescUpdate(h.node, e.PeerID, e.PathID)
+				sim.handleSnakeDescUpdate(h.node, e.PeerID)
 			case events.TreeRootAnnUpdate:
 				sim.handleTreeRootAnnUpdate(h.node, e.Root, e.Sequence, e.Time, e.Coords)
 			default:

cmd/pineconesim/simulator/pathfind.go

@@ -20,33 +20,6 @@ import (
 	"time"
 )
 
-func (sim *Simulator) PingTree(from, to string) (uint16, time.Duration, error) {
-	fromnode := sim.nodes[from]
-	tonode := sim.nodes[to]
-	success := false
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-	defer cancel()
-
-	defer func() {
-		sim.treePathConvergenceMutex.Lock()
-		if _, ok := sim.treePathConvergence[from]; !ok {
-			sim.treePathConvergence[from] = map[string]bool{}
-		}
-		sim.treePathConvergence[from][to] = success
-		sim.treePathConvergenceMutex.Unlock()
-	}()
-
-	hops, rtt, err := fromnode.Ping(ctx, tonode.Coords())
-	if err != nil {
-		return 0, 0, fmt.Errorf("fromnode.TreePing: %w", err)
-	}
-
-	success = true
-	sim.ReportDistance(from, to, int64(hops), false)
-	return hops, rtt, nil
-}
-
 func (sim *Simulator) PingSNEK(from, to string) (uint16, time.Duration, error) {
 	fromnode := sim.nodes[from]
 	tonode := sim.nodes[to]

cmd/pineconesim/simulator/ping.go

@@ -26,9 +26,7 @@ import (
 type PingType uint8
 
 const (
-	TreePing PingType = iota
-	TreePong
-	SNEKPing
+	SNEKPing PingType = iota
 	SNEKPong
 )
 
@@ -47,25 +45,17 @@ func (p *PingPayload) MarshalBinary(buffer []byte) (int, error) {
 	offset += 2
 
 	switch orig := p.origin.(type) {
-	case types.Coordinates:
-		on, err := orig.MarshalBinary(buffer[offset:])
-		if err != nil {
-			return 0, fmt.Errorf("f.Destination.MarshalBinary: %w", err)
-		}
-		offset += on
 	case types.PublicKey:
 		offset += copy(buffer[offset:], orig[:ed25519.PublicKeySize])
+	default:
+		return 0, fmt.Errorf("unknown address type")
 	}
 
 	switch dest := p.destination.(type) {
-	case types.Coordinates:
-		dn, err := dest.MarshalBinary(buffer[offset:])
-		if err != nil {
-			return 0, fmt.Errorf("f.Destination.MarshalBinary: %w", err)
-		}
-		offset += dn
 	case types.PublicKey:
 		offset += copy(buffer[offset:], dest[:ed25519.PublicKeySize])
+	default:
+		return 0, fmt.Errorf("unknown address type")
 	}
 
 	return offset, nil
@@ -78,22 +68,6 @@ func (p *PingPayload) UnmarshalBinary(data []byte) (int, error) {
 	offset += 3
 
 	switch p.pingType {
-	case TreePing, TreePong:
-		orig := types.Coordinates{}
-		oriLen, oriErr := orig.UnmarshalBinary(data[offset:])
-		if oriErr != nil {
-			return 0, fmt.Errorf("p.orig.UnmarshalBinary: %w", oriErr)
-		}
-		offset += oriLen
-		p.origin = net.Addr(orig)
-
-		dest := types.Coordinates{}
-		dstLen, dstErr := dest.UnmarshalBinary(data[offset:])
-		if dstErr != nil {
-			return 0, fmt.Errorf("p.dest.UnmarshalBinary: %w", dstErr)
-		}
-		offset += dstLen
-		p.destination = net.Addr(dest)
 	case SNEKPing, SNEKPong:
 		tempKey := types.PublicKey{}
 		offset += copy(tempKey[:], data[offset:])