Remove unnecessary variables in toCompressed

tylertreat · tylertreat · commit a7ad64230e40 · 2015-05-05T23:11:44.000-05:00
diff --git a/trie/ctrie/ctrie.go b/trie/ctrie/ctrie.go
@@ -493,10 +493,8 @@ func toContracted(cn *cNode, lev uint) *mainNode {
 
 // toCompressed compacts the C-node as a performance optimization.
 func toCompressed(cn *cNode, lev uint) *mainNode {
-	bmp := cn.bmp
-	arr := cn.array
-	tmpArray := make([]branch, len(arr))
-	for i, sub := range arr {
+	tmpArray := make([]branch, len(cn.array))
+	for i, sub := range cn.array {
 		switch sub.(type) {
 		case *iNode:
 			inode := sub.(*iNode)
@@ -510,7 +508,7 @@ func toCompressed(cn *cNode, lev uint) *mainNode {
 		}
 	}
 
-	return toContracted(&cNode{bmp: bmp, array: tmpArray}, lev)
+	return toContracted(&cNode{bmp: cn.bmp, array: tmpArray}, lev)
 }
 
 func entomb(m *sNode) *mainNode {

Original file line number	Diff line number	Diff line change
`@@ -493,10 +493,8 @@ func toContracted(cn cNode, lev uint) mainNode {`
`493`	`493`
`494`	`494`	`// toCompressed compacts the C-node as a performance optimization.`
`495`	`495`	`func toCompressed(cn cNode, lev uint) mainNode {`
`496`		`- bmp := cn.bmp`
`497`		`- arr := cn.array`
`498`		`- tmpArray := make([]branch, len(arr))`
`499`		`- for i, sub := range arr {`
	`496`	`+ tmpArray := make([]branch, len(cn.array))`
	`497`	`+ for i, sub := range cn.array {`
`500`	`498`	`switch sub.(type) {`
`501`	`499`	`case *iNode:`
`502`	`500`	`inode := sub.(*iNode)`
`@@ -510,7 +508,7 @@ func toCompressed(cn cNode, lev uint) mainNode {`
`510`	`508`	`}`
`511`	`509`	`}`
`512`	`510`
`513`		`- return toContracted(&cNode{bmp: bmp, array: tmpArray}, lev)`
	`511`	`+ return toContracted(&cNode{bmp: cn.bmp, array: tmpArray}, lev)`
`514`	`512`	`}`
`515`	`513`
`516`	`514`	`func entomb(m sNode) mainNode {`