Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

graphql: change receipt status to decimal instead of hex #22187

Merged
merged 3 commits into from
Jan 25, 2021
Merged

graphql: change receipt status to decimal instead of hex #22187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e12b23c
status should return decimal instead of hex string
renaynay Jan 18, 2021
08f0614
no explicit cast
renaynay Jan 18, 2021
c8d9b31
remove other TODO and type cast
renaynay Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions graphql/graphql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,12 @@ func (t *Transaction) getReceipt(ctx context.Context) (*types.Receipt, error) {
return receipts[t.index], nil
}

func (t *Transaction) Status(ctx context.Context) (*hexutil.Uint64, error) {
func (t *Transaction) Status(ctx context.Context) (*Long, error) {
receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil {
return nil, err
}
ret := hexutil.Uint64(receipt.Status)
ret := Long(receipt.Status)
return &ret, nil
}

Expand Down Expand Up @@ -812,7 +812,7 @@ type CallData struct {
type CallResult struct {
data hexutil.Bytes // The return data from the call
gasUsed Long // The amount of gas used
status hexutil.Uint64 // The return status of the call - 0 for failure or 1 for success.
status Long // The return status of the call - 0 for failure or 1 for success.
}

func (c *CallResult) Data() hexutil.Bytes {
Expand All @@ -823,7 +823,7 @@ func (c *CallResult) GasUsed() Long {
return c.gasUsed
}

func (c *CallResult) Status() hexutil.Uint64 {
func (c *CallResult) Status() Long {
return c.status
}

Expand All @@ -840,9 +840,9 @@ func (b *Block) Call(ctx context.Context, args struct {
if err != nil {
return nil, err
}
status := hexutil.Uint64(1)
status := Long(1)
if result.Failed() {
status = 0
status = Long(0) // TODO is this unnecessary
}

return &CallResult{
Expand Down Expand Up @@ -910,9 +910,9 @@ func (p *Pending) Call(ctx context.Context, args struct {
if err != nil {
return nil, err
}
status := hexutil.Uint64(1)
status := Long(1)
if result.Failed() {
status = 0
status = Long(0) // TODO is this necessary
renaynay marked this conversation as resolved.
Show resolved Hide resolved
}

return &CallResult{
Expand Down
6 changes: 6 additions & 0 deletions graphql/graphql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ func TestGraphQLBlockSerialization(t *testing.T) {
want: `{"data":{"block":{"estimateGas":53000}}}`,
code: 200,
},
// should return `status` as decimal
{
body: `{"query": "{block {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}"}`,
want: `{"data":{"block":{"number":10,"call":{"data":"0x","status":1}}}}`,
code: 200,
},
} {
resp, err := http.Post(fmt.Sprintf("%s/graphql", stack.HTTPEndpoint()), "application/json", strings.NewReader(tt.body))
if err != nil {
Expand Down