Merge pull request #18 from coinbase/patrick/update-sdk-go

[chore] Update `rosetta-sdk-go@v0.6.5`
coinbase · Dec 9, 2020 · f81889b · f81889b
2 parents bc8122d + 788ed02
commit f81889b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 31 deletions.
diff --git a/configuration/configuration.go b/configuration/configuration.go
@@ -73,7 +73,7 @@ const (
 	DefaultGethURL = "http://localhost:8545"
 
 	// MiddlewareVersion is the version of rosetta-ethereum.
-	MiddlewareVersion = "0.0.3"
+	MiddlewareVersion = "0.0.4"
 )
 
 // Configuration determines how

diff --git a/ethereum/client.go b/ethereum/client.go
@@ -114,7 +114,7 @@ func (ec *Client) Status(ctx context.Context) (
 		targetIndex := int64(progress.HighestBlock)
 
 		syncStatus = &RosettaTypes.SyncStatus{
-			CurrentIndex: currentIndex,
+			CurrentIndex: &currentIndex,
 			TargetIndex:  &targetIndex,
 		}
 	}

diff --git a/ethereum/client_test.go b/ethereum/client_test.go
@@ -39,14 +39,6 @@ import (
 	"golang.org/x/sync/semaphore"
 )
 
-func int64Pointer(i int64) *int64 {
-	return &i
-}
-
-func stringPointer(s string) *string {
-	return &s
-}
-
 func TestStatus_NotReady(t *testing.T) {
 	mockJSONRPC := &mocks.JSONRPC{}
 	mockGraphQL := &mocks.GraphQL{}
@@ -274,8 +266,8 @@ func TestStatus_Syncing(t *testing.T) {
 	}, block)
 	assert.Equal(t, int64(1603225195000), timestamp)
 	assert.Equal(t, &RosettaTypes.SyncStatus{
-		CurrentIndex: 25,
-		TargetIndex:  int64Pointer(8916760),
+		CurrentIndex: RosettaTypes.Int64(25),
+		TargetIndex:  RosettaTypes.Int64(8916760),
 	}, syncStatus)
 	assert.Equal(t, []*RosettaTypes.Peer{
 		{
@@ -428,10 +420,10 @@ func TestBalance_Historical_Hash(t *testing.T) {
 			Address: "0x2f93B2f047E05cdf602820Ac4B3178efc2b43D55",
 		},
 		&RosettaTypes.PartialBlockIdentifier{
-			Hash: stringPointer(
+			Hash: RosettaTypes.String(
 				"0x9999286598edf07606228ba0233736e544a086a8822c61f9db3706887fc25dda",
 			),
-			Index: int64Pointer(8165),
+			Index: RosettaTypes.Int64(8165),
 		},
 	)
 	assert.Equal(t, &RosettaTypes.AccountBalanceResponse{
@@ -496,7 +488,7 @@ func TestBalance_Historical_Index(t *testing.T) {
 			Address: "0x2f93B2f047E05cdf602820Ac4B3178efc2b43D55",
 		},
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(8165),
+			Index: RosettaTypes.Int64(8165),
 		},
 	)
 	assert.Equal(t, &RosettaTypes.AccountBalanceResponse{
@@ -605,7 +597,7 @@ func TestBalance_InvalidHash(t *testing.T) {
 			Address: "0x2f93B2f047E05cdf602820Ac4B3178efc2b43D55",
 		},
 		&RosettaTypes.PartialBlockIdentifier{
-			Hash: stringPointer(
+			Hash: RosettaTypes.String(
 				"0x7d2a2713026a0e66f131878de2bb2df2fff6c24562c1df61ec0265e5fedf2626",
 			),
 		},
@@ -879,7 +871,7 @@ func TestBlock_Hash(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Hash: stringPointer(
+			Hash: RosettaTypes.String(
 				"0xba9ded5ca1ec9adb9451bf062c9de309d9552fa0f0254a7b982d3daf7ae436ae",
 			),
 		},
@@ -955,7 +947,7 @@ func TestBlock_Index(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(10992),
+			Index: RosettaTypes.Int64(10992),
 		},
 	)
 	assert.Equal(t, correct.Block, resp)
@@ -1071,7 +1063,7 @@ func TestBlock_10994(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(10994),
+			Index: RosettaTypes.Int64(10994),
 		},
 	)
 	assert.NoError(t, err)
@@ -1180,7 +1172,7 @@ func TestBlock_10991(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(10991),
+			Index: RosettaTypes.Int64(10991),
 		},
 	)
 	assert.Equal(t, correct.Block, resp)
@@ -1282,7 +1274,7 @@ func TestBlock_239782(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(239782),
+			Index: RosettaTypes.Int64(239782),
 		},
 	)
 	assert.NoError(t, err)
@@ -1394,7 +1386,7 @@ func TestBlock_363415(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(363415),
+			Index: RosettaTypes.Int64(363415),
 		},
 	)
 	assert.NoError(t, err)
@@ -1506,7 +1498,7 @@ func TestBlock_363753(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(363753),
+			Index: RosettaTypes.Int64(363753),
 		},
 	)
 	assert.NoError(t, err)
@@ -1618,7 +1610,7 @@ func TestBlock_468179(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(468179),
+			Index: RosettaTypes.Int64(468179),
 		},
 	)
 	assert.NoError(t, err)
@@ -1731,7 +1723,7 @@ func TestBlock_363366(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(363366),
+			Index: RosettaTypes.Int64(363366),
 		},
 	)
 	assert.NoError(t, err)
@@ -1843,7 +1835,7 @@ func TestBlock_468194(t *testing.T) {
 	resp, err := c.Block(
 		ctx,
 		&RosettaTypes.PartialBlockIdentifier{
-			Index: int64Pointer(468194),
+			Index: RosettaTypes.Int64(468194),
 		},
 	)
 	assert.NoError(t, err)

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/coinbase/rosetta-ethereum
 
 require (
 	github.com/OneOfOne/xxhash v1.2.5 // indirect
-	github.com/coinbase/rosetta-sdk-go v0.6.3
+	github.com/coinbase/rosetta-sdk-go v0.6.5
 	github.com/ethereum/go-ethereum v1.9.24
 	github.com/fatih/color v1.10.0
 	github.com/go-kit/kit v0.9.0 // indirect

diff --git a/go.sum b/go.sum
@@ -87,8 +87,8 @@ github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U=
-github.com/coinbase/rosetta-sdk-go v0.6.3 h1:PPj14tPJ7SFc8sY/hlwK8zddT7PKwWU2wicxyerDxlg=
-github.com/coinbase/rosetta-sdk-go v0.6.3/go.mod h1:MvQfsL2KlJ5786OdDviRIJE3agui2YcvS1CaQPDl1Yo=
+github.com/coinbase/rosetta-sdk-go v0.6.5 h1:RytFDCPXS64vEYwIOsxsoQGlZZyP9RQvzyYikxymI4w=
+github.com/coinbase/rosetta-sdk-go v0.6.5/go.mod h1:MvQfsL2KlJ5786OdDviRIJE3agui2YcvS1CaQPDl1Yo=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

diff --git a/services/network_service_test.go b/services/network_service_test.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	middlewareVersion     = "0.0.3"
+	middlewareVersion     = "0.0.4"
 	defaultNetworkOptions = &types.NetworkOptionsResponse{
 		Version: &types.Version{
 			RosettaVersion:    types.RosettaAPIVersion,
@@ -100,7 +100,7 @@ func TestNetworkEndpoints_Online(t *testing.T) {
 	currentTime := int64(1000000000000)
 
 	syncStatus := &types.SyncStatus{
-		CurrentIndex: 100,
+		CurrentIndex: types.Int64(100),
 	}
 
 	peers := []*types.Peer{