Use Long for block number

ethereum · Nov 24, 2020 · f1fe93c · f1fe93c
1 parent cd7e560
commit f1fe93c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/graphql/graphql.go b/graphql/graphql.go
@@ -43,10 +43,6 @@ var (
 
 type Long uint64
 
-func (b Long) String() string {
-	return string(b)
-}
-
 // ImplementsGraphQLType returns true if Long implements the provided GraphQL type.
 func (b Long) ImplementsGraphQLType(name string) bool { return name == "Long" }
 
@@ -442,13 +438,13 @@ func (b *Block) resolveReceipts(ctx context.Context) ([]*types.Receipt, error) {
 	return b.receipts, nil
 }
 
-func (b *Block) Number(ctx context.Context) (hexutil.Uint64, error) {
+func (b *Block) Number(ctx context.Context) (Long, error) {
 	header, err := b.resolveHeader(ctx)
 	if err != nil {
-		return 0, err
+		return Long(0), err
 	}
 
-	return hexutil.Uint64(header.Number.Uint64()), nil
+	return Long(header.Number.Uint64()), nil
 }
 
 func (b *Block) Hash(ctx context.Context) (common.Hash, error) {

diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go
@@ -60,7 +60,7 @@ func TestGraphQLHTTPOnSamePort_GQLRequest_Successful(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not read from response body: %v", err)
 	}
-	expected := "{\"data\":{\"block\":{\"number\":\"0x0\"}}}"
+	expected := "{\"data\":{\"block\":{\"number\":0}}}"
 	assert.Equal(t, expected, string(bodyBytes))
 }
 
@@ -85,7 +85,7 @@ func TestGraphQLBlockSerialization(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not read from response body: %v", err)
 	}
-	expected := "{\"data\":{\"block\":{\"number\":\"0x0\",\"gasUsed\":0,\"gasLimit\":5000}}}"
+	expected := "{\"data\":{\"block\":{\"number\":0,\"gasUsed\":0,\"gasLimit\":5000}}}"
 	assert.Equal(t, expected, string(bodyBytes))
 }