remove unnecessary type

eikenb · eikenb · commit d0a1c8098b3a · 2018-07-23T12:18:00.000-07:00
Added to shorten code text, but not used enough to be worth the extra type.
diff --git a/packet-manager.go b/packet-manager.go
@@ -78,7 +78,8 @@ func (s *packetManager) close() {
 // The goal is to process packets in the order they are received as is
 // requires by section 7 of the RFC, while maximizing throughput of file
 // transfers.
-func (s *packetManager) workerChan(runWorker func(requestChan)) requestChan {
+func (s *packetManager) workerChan(runWorker func(chan requestPacket),
+) chan requestPacket {
 
 	rwChan := make(chan requestPacket, SftpServerWorkerCount)
 	for i := 0; i < SftpServerWorkerCount; i++ {
diff --git a/packet-typing.go b/packet-typing.go
@@ -12,8 +12,6 @@ type requestPacket interface {
 	id() uint32
 }
 
-type requestChan chan requestPacket
-
 type responsePacket interface {
 	encoding.BinaryMarshaler
 	id() uint32
diff --git a/request-server.go b/request-server.go
@@ -106,7 +106,7 @@ func (rs *RequestServer) Serve() error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	var wg sync.WaitGroup
-	runWorker := func(ch requestChan) {
+	runWorker := func(ch chan requestPacket) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
diff --git a/server.go b/server.go
@@ -287,7 +287,7 @@ func handlePacket(s *Server, p interface{}) error {
 // is stopped.
 func (svr *Server) Serve() error {
 	var wg sync.WaitGroup
-	runWorker := func(ch requestChan) {
+	runWorker := func(ch chan requestPacket) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ type requestPacket interface {`
`12`	`12`	`id() uint32`
`13`	`13`	`}`
`14`	`14`
`15`		`-type requestChan chan requestPacket`
`16`		`-`
`17`	`15`	`type responsePacket interface {`
`18`	`16`	`encoding.BinaryMarshaler`
`19`	`17`	`id() uint32`