Merge pull request #414 from ava-labs/add-general-indexer

Add general indexer fixes

Author: StephenButtolph

indexer/client_test.go

@@ -48,7 +48,7 @@ func TestIndexClient(t *testing.T) {
 	id = ids.GenerateTestID()
 	client.EndpointRequester = &mockClient{
 		f: func(reply interface{}) error {
-			*(reply.(**GetContainerRangeResponse)) = &GetContainerRangeResponse{Containers: []FormattedContainer{{ID: id}}}
+			*(reply.(*GetContainerRangeResponse)) = GetContainerRangeResponse{Containers: []FormattedContainer{{ID: id}}}
 			return nil
 		},
 	}

indexer/indexer.go

@@ -47,7 +47,7 @@ var (
 	blockPrefix             = byte(0x03)
 	isIncompletePrefix      = byte(0x04)
 	previouslyIndexedPrefix = byte(0x05)
-	hasRunKey               = []byte{0x06}
+	hasRunKey               = []byte{0x07}
 )
 
 var (
@@ -182,14 +182,6 @@ func (i *indexer) RegisterChain(name string, ctx *snow.Context, engine common.En
 		return
 	}
 
-	if !i.allowIncompleteIndex && isIncomplete && (previouslyIndexed || i.hasRunBefore) {
-		i.log.Fatal("index %s is incomplete but incomplete indices are disabled. Shutting down", name)
-		if err := i.close(); err != nil {
-			i.log.Error("error while closing indexer: %s", err)
-		}
-		return
-	}
-
 	if !i.indexingEnabled { // Indexing is disabled
 		if previouslyIndexed && !i.allowIncompleteIndex {
 			// We indexed this chain in a previous run but not in this run.
@@ -213,6 +205,14 @@ func (i *indexer) RegisterChain(name string, ctx *snow.Context, engine common.En
 		return
 	}
 
+	if !i.allowIncompleteIndex && isIncomplete && (previouslyIndexed || i.hasRunBefore) {
+		i.log.Fatal("index %s is incomplete but incomplete indices are disabled. Shutting down", name)
+		if err := i.close(); err != nil {
+			i.log.Error("error while closing indexer: %s", err)
+		}
+		return
+	}
+
 	// Mark that in this run, this chain was indexed
 	if err := i.markPreviouslyIndexed(chainID); err != nil {
 		i.log.Error("couldn't mark chain %s as indexed: %s", name, err)

indexer/indexer_test.go

@@ -502,10 +502,6 @@ func TestIncompleteIndex(t *testing.T) {
 	assert.NoError(err)
 	idxr, ok = idxrIntf.(*indexer)
 	assert.True(ok)
-
-	// Register the chain again. Should still die due to incomplete index.
-	idxr.RegisterChain("chain1", chain1Ctx, chainEngine)
-	assert.True(idxr.closed)
 }
 
 // Ensure we only index chains in the primary network