Nits

algorand · Jan 23, 2023 · f6e9bf0 · f6e9bf0
1 parent 487307f
commit f6e9bf0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/api/handlers_e2e_test.go b/api/handlers_e2e_test.go
@@ -14,6 +14,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/labstack/echo/v4"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/algorand/avm-abi/apps"
 	"github.com/algorand/go-algorand-sdk/v2/encoding/json"
 	sdk "github.com/algorand/go-algorand-sdk/v2/types"
@@ -27,10 +32,6 @@ import (
 	"github.com/algorand/indexer/idb/postgres"
 	pgtest "github.com/algorand/indexer/idb/postgres/testing"
 	"github.com/algorand/indexer/util/test"
-	"github.com/labstack/echo/v4"
-	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 var defaultOpts = ExtraOptions{

diff --git a/conduit/plugins/importers/syncalgod/syncalgod_importer.go b/conduit/plugins/importers/syncalgod/syncalgod_importer.go
@@ -19,6 +19,7 @@ import (
 	"github.com/algorand/go-algorand-sdk/v2/client/v2/algod"
 	"github.com/algorand/go-algorand-sdk/v2/encoding/json"
 	sdk "github.com/algorand/go-algorand-sdk/v2/types"
+	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/rpcs"
 )
 
@@ -138,7 +139,7 @@ func (sm *syncModeImporter) GetBlock(rnd uint64) (data.BlockData, error) {
 			return blk, err
 		}
 		tmpBlk := new(rpcs.EncodedBlockCert)
-		err = json.Decode(blockbytes, tmpBlk)
+		err = protocol.Decode(blockbytes, tmpBlk)
 		if err != nil {
 			return blk, err
 		}

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ replace github.com/algorand/go-algorand => ./third_party/go-algorand
 require (
 	github.com/algorand/avm-abi v0.2.0
 	github.com/algorand/go-algorand v0.0.0-20220211161928-53b157beb10f
-	github.com/algorand/go-algorand-sdk v1.22.1-0.20221209152459-223656f08456
 	github.com/algorand/go-algorand-sdk/v2 v2.0.0-20230111184032-153c9ac26286
 	github.com/algorand/go-codec/codec v1.1.8
 	github.com/algorand/go-deadlock v0.2.2

diff --git a/go.sum b/go.sum
@@ -88,8 +88,6 @@ github.com/algorand/avm-abi v0.2.0 h1:bkjsG+BOEcxUcnGSALLosmltE0JZdg+ZisXKx0UDX2
 github.com/algorand/avm-abi v0.2.0/go.mod h1:+CgwM46dithy850bpTeHh9MC99zpn2Snirb3QTl2O/g=
 github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414 h1:nwYN+GQ7Z5OOfZwqBO1ma7DSlP7S1YrKWICOyjkwqrc=
 github.com/algorand/falcon v0.0.0-20220727072124-02a2a64c4414/go.mod h1:OkQyHlGvS0kLNcIWbC21/uQcnbfwSOQm+wiqWwBG9pQ=
-github.com/algorand/go-algorand-sdk v1.22.1-0.20221209152459-223656f08456 h1:Z0oLEmvtbA0mpD3RWmRahoc9jnk/5b82uCVNpSic1UM=
-github.com/algorand/go-algorand-sdk v1.22.1-0.20221209152459-223656f08456/go.mod h1:WEeJcctOHMzDFTgVJ6GT8BLUo9DbFTT47S+Kzx7ffXQ=
 github.com/algorand/go-algorand-sdk/v2 v2.0.0-20230111184032-153c9ac26286 h1:X1bIxpzX8CCRJ/6+2vDsjZT7xBwkjmH/6bsjxrwvn0w=
 github.com/algorand/go-algorand-sdk/v2 v2.0.0-20230111184032-153c9ac26286/go.mod h1:Nt3EHpP8AznLs0/EFfhr0/xsVf5ucnvjNeRygGgbUzM=
 github.com/algorand/go-codec v1.1.8 h1:XDSreeeZY8gMst6Edz4RBkl08/DGMJOeHYkoXL2B7wI=

diff --git a/idb/postgres/internal/writer/writer_test.go b/idb/postgres/internal/writer/writer_test.go
@@ -13,12 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/algorand/avm-abi/apps"
-	crypto2 "github.com/algorand/go-algorand-sdk/v2/crypto"
-	sdk "github.com/algorand/go-algorand-sdk/v2/types"
-	"github.com/algorand/go-algorand/crypto"
-	"github.com/algorand/go-algorand/data/basics"
-	"github.com/algorand/go-algorand/ledger/ledgercore"
-
 	"github.com/algorand/indexer/helpers"
 	"github.com/algorand/indexer/idb"
 	"github.com/algorand/indexer/idb/postgres/internal/encoding"
@@ -29,6 +23,12 @@ import (
 	"github.com/algorand/indexer/types"
 	"github.com/algorand/indexer/util"
 	"github.com/algorand/indexer/util/test"
+
+	crypto2 "github.com/algorand/go-algorand-sdk/v2/crypto"
+	sdk "github.com/algorand/go-algorand-sdk/v2/types"
+	"github.com/algorand/go-algorand/crypto"
+	"github.com/algorand/go-algorand/data/basics"
+	"github.com/algorand/go-algorand/ledger/ledgercore"
 )
 
 var serializable = pgx.TxOptions{IsoLevel: pgx.Serializable}

diff --git a/util/test/testutil.go b/util/test/testutil.go
@@ -13,7 +13,7 @@ import (
 	"github.com/algorand/indexer/types"
 	"github.com/algorand/indexer/util"
 
-	"github.com/algorand/go-algorand-sdk/encoding/msgpack"
+	"github.com/algorand/go-algorand-sdk/v2/encoding/msgpack"
 	sdk "github.com/algorand/go-algorand-sdk/v2/types"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/ledger"