refactor: remove unused StreamOpts

Signed-off-by: Christian Stewart <[email protected]>

README.md

@@ -10,7 +10,7 @@
  - **Flexible**: use multiple transports, protocols, simultaneously.
  - **Meshing**: supports multi-hop routing to a desired target peer w/ circuits.
  - **PubSub**: publish/subscribe channels with pluggable implementations.
- - **Robust**: uses Quic for reliable connections over lossy transports.
+ - **Robust**: uses Quic for lossless links over lossy transports.
 
 Bifrost uses [ControllerBus] controllers and directives to send any protocol
 over any transport with extensive and flexible configuration.

cli/client.go

@@ -244,18 +244,6 @@ func (a *ClientArgs) BuildCommands() []*cli.Command {
 					Usage:       "if set, filter the transport id",
 					Destination: &a.DialConf.TransportId,
 				},
-				&cli.BoolFlag{
-					Name:        "encrypted",
-					Usage:       "encrypted stream",
-					Destination: &a.DialConf.Encrypted,
-					Value:       true,
-				},
-				&cli.BoolFlag{
-					Name:        "reliable",
-					Usage:       "reliable stream",
-					Destination: &a.DialConf.Reliable,
-					Value:       true,
-				},
 			},
 		},
 		{
@@ -283,18 +271,6 @@ func (a *ClientArgs) BuildCommands() []*cli.Command {
 					Usage:       "listen multiaddr",
 					Destination: &a.ListeningConf.ListenMultiaddr,
 				},
-				&cli.BoolFlag{
-					Name:        "encrypted",
-					Usage:       "encrypted stream",
-					Destination: &a.ListeningConf.Encrypted,
-					Value:       true,
-				},
-				&cli.BoolFlag{
-					Name:        "reliable",
-					Usage:       "reliable stream",
-					Destination: &a.ListeningConf.Reliable,
-					Value:       true,
-				},
 			},
 		},
 	}

examples/http-forwarding/README.md

@@ -76,8 +76,6 @@ listening:
     remotePeerId: 12D3KooWC9dBAEoTHbEXq2aaTeFit7QVdvPcb6Yf76oGQZ6dGf8N
     protocolId: my/http/forwarding
     listenMultiaddr: "/ip4/127.0.0.1/tcp/8084"
-    reliable: true
-    encrypted: true
 ```
 
 ### Changing the transport

examples/http-forwarding/node-2.yaml

@@ -12,6 +12,4 @@ listening:
     remotePeerId: 12D3KooWC9dBAEoTHbEXq2aaTeFit7QVdvPcb6Yf76oGQZ6dGf8N
     protocolId: my/http/forwarding
     listenMultiaddr: "/ip4/127.0.0.1/tcp/8084"
-    reliable: true
-    encrypted: true
 

examples/webrtc-forwarding/node-2.yaml

@@ -4,8 +4,6 @@ listening:
     remotePeerId: 12D3KooWC9dBAEoTHbEXq2aaTeFit7QVdvPcb6Yf76oGQZ6dGf8N 
     protocolId: my/http/forwarding
     listenMultiaddr: "/ip4/127.0.0.1/tcp/8084"
-    reliable: true
-    encrypted: true
 
 signaling-websocket:
   id: bifrost/websocket

pubsub/controller/tracked-link.go

@@ -38,7 +38,7 @@ func (t *trackedLink) trackLink(ctx context.Context) error {
 		link.NewOpenStreamViaLink(
 			t.lnk.GetUUID(),
 			t.c.protocolID,
-			stream.OpenOpts{Reliable: true, Encrypted: true},
+			stream.OpenOpts{},
 			t.lnk.GetTransportUUID(),
 		),
 		nil,

pubsub/floodsub/floodsub.go

@@ -268,11 +268,6 @@ func (m *FloodSub) AddPeerStream(
 	mstrm link.MountedStream,
 ) {
 	le := m.le.WithField("peer", tpl.PeerID.String())
-	if !mstrm.GetOpenOpts().Encrypted || !mstrm.GetOpenOpts().Reliable {
-		le.Warn("rejecting unencrypted or unreliable pubsub stream")
-		mstrm.GetStream().Close()
-		return
-	}
 	sh := &streamHandler{
 		m:      m,
 		le:     le,

pubsub/nats/nats.go

@@ -146,11 +146,6 @@ func (m *Nats) Execute(ctx context.Context) error {
 // The pubsub should communicate over the stream.
 func (m *Nats) AddPeerStream(tpl pubsub.PeerLinkTuple, initiator bool, mstrm link.MountedStream) {
 	le := m.le.WithField("peer", tpl.PeerID.String())
-	if !mstrm.GetOpenOpts().Encrypted || !mstrm.GetOpenOpts().Reliable {
-		le.Warn("rejecting unencrypted or unreliable pubsub stream")
-		mstrm.GetStream().Close()
-		return
-	}
 	protocolID := mstrm.GetProtocolID()
 	streamType := ProtocolIDToStreamType(protocolID)
 	if streamType == NatsConnType_NatsConnType_UNKNOWN {

sim/simulate/assertions.go

@@ -32,7 +32,7 @@ func TestConnectivity(ctx context.Context, px0, px1 *Peer) error {
 			px0.GetPeerID(),
 			px1.GetPeerID(),
 			0,
-			stream.OpenOpts{Reliable: true, Encrypted: true},
+			stream.OpenOpts{},
 		),
 		nil,
 		nil,

stream/api/dial/dial.go

@@ -43,10 +43,7 @@ func ProcessRPC(
 		protocol.ID(conf.GetProtocolId()),
 		localPeerID, remotePeerID,
 		conf.GetTransportId(),
-		stream.OpenOpts{
-			Reliable:  conf.GetReliable(),
-			Encrypted: conf.GetEncrypted(),
-		},
+		stream.OpenOpts{},
 	)
 	if err != nil {
 		return err

stream/api/dial/dial.pb.ts

@@ -39,18 +39,6 @@ export interface Config {
    * @generated from field: uint64 transport_id = 4;
    */
   transportId?: bigint
-  /**
-   * Encrypted indicates the stream should be encrypted.
-   *
-   * @generated from field: bool encrypted = 5;
-   */
-  encrypted?: boolean
-  /**
-   * Reliable indicates the stream should be reliable.
-   *
-   * @generated from field: bool reliable = 6;
-   */
-  reliable?: boolean
 }
 
 // Config contains the message type declaration for Config.
@@ -61,8 +49,6 @@ export const Config: MessageType<Config> = createMessageType({
     { no: 2, name: 'local_peer_id', kind: 'scalar', T: ScalarType.STRING },
     { no: 3, name: 'protocol_id', kind: 'scalar', T: ScalarType.STRING },
     { no: 4, name: 'transport_id', kind: 'scalar', T: ScalarType.UINT64 },
-    { no: 5, name: 'encrypted', kind: 'scalar', T: ScalarType.BOOL },
-    { no: 6, name: 'reliable', kind: 'scalar', T: ScalarType.BOOL },
   ] as readonly PartialFieldInfo[],
   packedByDefault: true,
 })

stream/api/dial/dial.proto

@@ -13,8 +13,4 @@ message Config {
   // TransportId constrains the transport ID to dial with.
   // Can be empty.
   uint64 transport_id = 4;
-  // Encrypted indicates the stream should be encrypted.
-  bool encrypted = 5;
-  // Reliable indicates the stream should be reliable.
-  bool reliable = 6;
-}
+}

stream/listening/listening.go

@@ -133,10 +133,7 @@ func (c *Controller) handleConn(ctx context.Context, conn manet.Conn) {
 	openCtx, openCtxCancel := context.WithTimeout(ctx, openStreamTimeout)
 	defer openCtxCancel()
 
-	opts := stream.OpenOpts{
-		Reliable:  c.conf.GetReliable(),
-		Encrypted: c.conf.GetEncrypted(),
-	}
+	opts := stream.OpenOpts{}
 	mstrm, rel, err := link.OpenStreamWithPeerEx(
 		openCtx,
 		c.bus,