1 files changed, 50 insertions, 4 deletions

diff --git a/node/service_test.go b/node/service_test.go
index 50a4f9715..921a1a012 100644
--- a/node/service_test.go
+++ b/node/service_test.go
@@ -17,14 +17,16 @@
 package node
 
 import (
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
 )
 
-// Tests that service context methods work properly.
-func TestServiceContext(t *testing.T) {
+// Tests that databases are correctly created persistent or ephemeral based on
+// the configured service context.
+func TestContextDatabases(t *testing.T) {
 	// Create a temporary folder and ensure no database is contained within
 	dir, err := ioutil.TempDir("", "")
 	if err != nil {
@@ -36,7 +38,7 @@ func TestServiceContext(t *testing.T) {
 		t.Fatalf("non-created database already exists")
 	}
 	// Request the opening/creation of a database and ensure it persists to disk
-	ctx := &ServiceContext{dataDir: dir}
+	ctx := &ServiceContext{datadir: dir}
 	db, err := ctx.Database("persistent", 0)
 	if err != nil {
 		t.Fatalf("failed to open persistent database: %v", err)
@@ -47,7 +49,7 @@ func TestServiceContext(t *testing.T) {
 		t.Fatalf("persistent database doesn't exists: %v", err)
 	}
 	// Request th opening/creation of an ephemeral database and ensure it's not persisted
-	ctx = &ServiceContext{dataDir: ""}
+	ctx = &ServiceContext{datadir: ""}
 	db, err = ctx.Database("ephemeral", 0)
 	if err != nil {
 		t.Fatalf("failed to open ephemeral database: %v", err)
@@ -58,3 +60,47 @@ func TestServiceContext(t *testing.T) {
 		t.Fatalf("ephemeral database exists")
 	}
 }
+
+// Tests that already constructed services can be retrieves by later ones.
+func TestContextServices(t *testing.T) {
+	stack, err := New(testNodeConfig)
+	if err != nil {
+		t.Fatalf("failed to create protocol stack: %v", err)
+	}
+	// Define a set of services, constructed before/after a verifier
+	formers := []string{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"}
+	latters := []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}
+
+	verifier := func(ctx *ServiceContext) (Service, error) {
+		for i, id := range formers {
+			if ctx.Service(id) == nil {
+				return nil, fmt.Errorf("former %d: service not found", i)
+			}
+		}
+		for i, id := range latters {
+			if ctx.Service(id) != nil {
+				return nil, fmt.Errorf("latters %d: service found", i)
+			}
+		}
+		return new(NoopService), nil
+	}
+	// Register the collection of services
+	for i, id := range formers {
+		if err := stack.Register(id, NewNoopService); err != nil {
+			t.Fatalf("former #%d: failed to register service: %v", i, err)
+		}
+	}
+	if err := stack.Register("verifier", verifier); err != nil {
+		t.Fatalf("failed to register service verifier: %v", err)
+	}
+	for i, id := range latters {
+		if err := stack.Register(id, NewNoopService); err != nil {
+			t.Fatalf("latter #%d: failed to register service: %v", i, err)
+		}
+	}
+	// Start the protocol stack and ensure services are constructed in order
+	if err := stack.Start(); err != nil {
+		t.Fatalf("failed to start stack: %v", err)
+	}
+	defer stack.Stop()
+}