importer: rewrite make integration

.circleci/config.yml

@@ -170,7 +170,6 @@ commands:
       - run:
           command: make test
           no_output_timeout: 15m
-      - run: make integration
       - run: make test-generate
       - run: make fakepackage
 

Makefile

@@ -69,11 +69,6 @@ lint: go-algorand
 fmt:
 	go fmt ./...
 
-integration: cmd/algorand-indexer/algorand-indexer
-	mkdir -p test/blockdata
-	curl -s https://algorand-testdata.s3.amazonaws.com/indexer/test_blockdata/create_destroy.tar.bz2 -o test/blockdata/create_destroy.tar.bz2
-	test/postgres_integration_test.sh
-
 # note: when running e2e tests manually be sure to set the e2e filename:
 # 	'export CI_E2E_FILENAME=rel-nightly'
 # To keep the container running at exit set 'export EXTRA="--keep-alive"',

cmd/algorand-indexer/main.go

@@ -111,8 +111,6 @@ func init() {
 	logger.SetOutput(os.Stdout)
 	logger.SetLevel(log.InfoLevel)
 
-	rootCmd.AddCommand(importCmd)
-	importCmd.Hidden = true
 	daemonCmd := DaemonCmd()
 	rootCmd.AddCommand(daemonCmd)
 	rootCmd.AddCommand(apiConfigCmd)
@@ -129,7 +127,6 @@ func init() {
 		cmd.Flags().BoolVarP(&doVersion, "version", "v", false, "print version and exit")
 	}
 	addFlags(daemonCmd)
-	addFlags(importCmd)
 
 	viper.RegisterAlias("postgres", "postgres-connection-string")
 

conduit/plugins/exporters/postgresql/postgresql_exporter.go

@@ -18,8 +18,8 @@ import (
 	"github.com/algorand/indexer/idb"
 	// Necessary to ensure the postgres implementation has been registered in the idb factory
 	_ "github.com/algorand/indexer/idb/postgres"
-	"github.com/algorand/indexer/importer"
 	"github.com/algorand/indexer/types"
+	iutil "github.com/algorand/indexer/util"
 
 	sdk "github.com/algorand/go-algorand-sdk/v2/types"
 )
@@ -78,7 +78,7 @@ func (exp *postgresqlExporter) Init(ctx context.Context, initProvider data.InitP
 	}
 	exp.db = db
 	<-ready
-	_, err = importer.EnsureInitialImport(exp.db, *initProvider.GetGenesis())
+	_, err = iutil.EnsureInitialImport(exp.db, *initProvider.GetGenesis())
 	if err != nil {
 		return fmt.Errorf("error importing genesis: %v", err)
 	}

idb/postgres/postgres_integration_test.go

@@ -26,7 +26,6 @@ import (
 	"github.com/algorand/indexer/idb/postgres/internal/schema"
 	pgtest "github.com/algorand/indexer/idb/postgres/internal/testing"
 	pgutil "github.com/algorand/indexer/idb/postgres/internal/util"
-	"github.com/algorand/indexer/importer"
 	"github.com/algorand/indexer/protocol"
 	"github.com/algorand/indexer/util"
 	"github.com/algorand/indexer/util/test"
@@ -1977,7 +1976,7 @@ func TestGenesisHashCheckAtInitialImport(t *testing.T) {
 	genesisReader := bytes.NewReader(json.Encode(genesis))
 	gen, err := util.ReadGenesis(genesisReader)
 	require.NoError(t, err)
-	imported, err := importer.EnsureInitialImport(db, gen)
+	imported, err := util.EnsureInitialImport(db, gen)
 	require.NoError(t, err)
 	require.True(t, true, imported)
 	// network state should be set
@@ -1991,7 +1990,7 @@ func TestGenesisHashCheckAtInitialImport(t *testing.T) {
 	gen, err = util.ReadGenesis(genesisReader)
 	require.NoError(t, err)
 	// different genesisHash, should fail
-	_, err = importer.EnsureInitialImport(db, gen)
+	_, err = util.EnsureInitialImport(db, gen)
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "genesis hash not matching")