Simplify more

howbazaar · howbazaar · commit a168b5e21ba8 · 2014-08-29T11:23:47.000+12:00
diff --git a/state/apiserver/deployer/deployer.go b/state/apiserver/deployer/deployer.go
@@ -49,14 +49,10 @@ func NewDeployerAPI(
 		}
 		// Then we just check if the unit is already known.
 		return func(tag names.Tag) bool {
-			// gcc has horrible problems comparing types and interfaces
-			// so convert to concrete types.
-			utag, ok := tag.(names.UnitTag)
-			if !ok {
-				return false
-			}
 			for _, unit := range units {
-				if names.NewUnitTag(unit) == utag {
+				// TODO (thumper): remove the names.Tag conversion when gccgo
+				// implements concrete-type-to-interface comparison correctly.
+				if names.Tag(names.NewUnitTag(unit)) == tag {
 					return true
 				}
 			}
diff --git a/state/apiserver/networker/networker.go b/state/apiserver/networker/networker.go
@@ -52,18 +52,13 @@ func NewNetworkerAPI(
 				// Only machine tags are allowed.
 				return false
 			}
-
-			// gcc has horrible problems comparing types and interfaces
-			// so convert to concrete types.
-			authMachine, ok := authEntityTag.(names.MachineTag)
-			if !ok {
-				// the auth tag should always be a machine...
-				return false
-			}
 			id := tag.Id()
 			for parentId := state.ParentId(id); parentId != ""; parentId = state.ParentId(parentId) {
 				// Until a top-level machine is reached.
-				if names.NewMachineTag(parentId) == authMachine {
+
+				// TODO (thumper): remove the names.Tag conversion when gccgo
+				// implements concrete-type-to-interface comparison correctly.
+				if names.Tag(names.NewMachineTag(parentId)) == authEntityTag {
 					// All containers with the authenticated machine as a
 					// parent are accessible by it.
 					return true

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,10 @@ func NewDeployerAPI(`
`49`	`49`	`}`
`50`	`50`	`// Then we just check if the unit is already known.`
`51`	`51`	`return func(tag names.Tag) bool {`
`52`		`- // gcc has horrible problems comparing types and interfaces`
`53`		`- // so convert to concrete types.`
`54`		`- utag, ok := tag.(names.UnitTag)`
`55`		`- if !ok {`
`56`		`- return false`
`57`		`- }`
`58`	`52`	`for _, unit := range units {`
`59`		`- if names.NewUnitTag(unit) == utag {`
	`53`	`+ // TODO (thumper): remove the names.Tag conversion when gccgo`
	`54`	`+ // implements concrete-type-to-interface comparison correctly.`
	`55`	`+ if names.Tag(names.NewUnitTag(unit)) == tag {`
`60`	`56`	`return true`
`61`	`57`	`}`
`62`	`58`	`}`