Skip to content

Commit 50b971c

Browse files
authored
Remove unused QUIC config field from CS (scionproto#4548)
And the type `env.QUIC`, as it's also unused. Also relates to scionproto#2810 Closes scionproto#2810
1 parent 9be9885 commit 50b971c

File tree

4 files changed

+0
-24
lines changed

4 files changed

+0
-24
lines changed

acceptance/topo_cs_reload/testdata/cs.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ connection = "cs1-ff00_0_110-1.beacon.db"
1616

1717
[metrics]
1818
prometheus = "242.253.100.2:30453"
19-
20-
[quic]
21-
address = "242.253.100.2:0"

control/config/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ type Config struct {
5656
Metrics env.Metrics `toml:"metrics,omitempty"`
5757
API api.Config `toml:"api,omitempty"`
5858
Tracing env.Tracing `toml:"tracing,omitempty"`
59-
QUIC env.QUIC `toml:"quic,omitempty"`
6059
BeaconDB storage.DBConfig `toml:"beacon_db,omitempty"`
6160
TrustDB storage.DBConfig `toml:"trust_db,omitempty"`
6261
PathDB storage.DBConfig `toml:"path_db,omitempty"`
@@ -115,7 +114,6 @@ func (cfg *Config) Sample(dst io.Writer, path config.Path, _ config.CtxMap) {
115114
&cfg.Metrics,
116115
&cfg.API,
117116
&cfg.Tracing,
118-
&cfg.QUIC,
119117
config.OverrideName(
120118
config.FormatData(
121119
&cfg.BeaconDB,

private/env/env.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,3 @@ func (cfg *Tracing) NewTracer(id string) (opentracing.Tracer, io.Closer, error)
250250
jaegercfg.Extractor(opentracing.Binary, bp),
251251
jaegercfg.Injector(opentracing.Binary, bp))
252252
}
253-
254-
// QUIC contains configuration for control-plane speakers.
255-
type QUIC struct {
256-
Address string `toml:"address,omitempty"`
257-
}
258-
259-
func (cfg *QUIC) Sample(dst io.Writer, path config.Path, _ config.CtxMap) {
260-
config.WriteString(dst, quicSample)
261-
}
262-
263-
func (cfg *QUIC) ConfigName() string {
264-
return "quic"
265-
}

private/env/sample.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,3 @@ debug = false
5151
# (default: localhost:6831)
5252
agent = "localhost:6831"
5353
`
54-
55-
const quicSample = `
56-
# The address to start a QUIC server on (ip:port). If not set, a QUIC server on
57-
# the public IP and a high port is started. (default "")
58-
address = ""
59-
`

0 commit comments

Comments
 (0)