From e5113889f44580d16437d2c03c9702302687bfe8 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 5 Jun 2015 15:23:01 +0100
Subject: [PATCH] Move NumFreeAddresses() into test

---
 ipam/space/space.go      |  8 --------
 ipam/space/space_test.go | 10 ++++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ipam/space/space.go b/ipam/space/space.go
index 2e2bd8d5..549424fd 100644
--- a/ipam/space/space.go
+++ b/ipam/space/space.go
@@ -69,14 +69,6 @@ func (s *Space) Claim(addr address.Address) error {
 	return nil
 }
 
-func (s *Space) NumFreeAddresses() address.Offset {
-	res := address.Offset(0)
-	for i := 0; i < len(s.free); i += 2 {
-		res += address.Subtract(s.free[i+1], s.free[i])
-	}
-	return res
-}
-
 func (s *Space) NumFreeAddressesInRange(start, end address.Address) address.Offset {
 	res := address.Offset(0)
 	for i := 0; i < len(s.free); i += 2 {
diff --git a/ipam/space/space_test.go b/ipam/space/space_test.go
index 1585a2c5..12ede1e4 100644
--- a/ipam/space/space_test.go
+++ b/ipam/space/space_test.go
@@ -19,6 +19,16 @@ func ip(s string) address.Address {
 	return addr
 }
 
+// Helper function to avoid 'NumFreeAddressesInRange(start, end)'
+// dozens of times in tests
+func (s *Space) NumFreeAddresses() address.Offset {
+	res := address.Offset(0)
+	for i := 0; i < len(s.free); i += 2 {
+		res += address.Subtract(s.free[i+1], s.free[i])
+	}
+	return res
+}
+
 func TestLowlevel(t *testing.T) {
 	a := []address.Address{}
 	a = add(a, 100, 200)