forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Converted most quantities to Long instead of Int

Browse source
This commit is contained in:
Nick Johnson 2018-10-16 14:30:13 +01:00
parent 21cef58afb
commit d92e373123
1 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
ethgraphql/main.go
View file

@ -78,13 +78,13 @@ func (a *Account) Balance(ctx context.Context) (hexutil.Big, error) {
return hexutil.Big(*state.GetBalance(a.address)), nil return hexutil.Big(*state.GetBalance(a.address)), nil
} }
func (a *Account) TransactionCount(ctx context.Context) (int32, error) { func (a *Account) TransactionCount(ctx context.Context) (hexutil.Uint64, error) {
state, err := a.getState(ctx) state, err := a.getState(ctx)
if err != nil { if err != nil {
return 0, err return 0, err
} }
return int32(state.GetNonce(a.address)), nil return hexutil.Uint64(state.GetNonce(a.address)), nil
} }
func (a *Account) Code(ctx context.Context) (hexutil.Bytes, error) { func (a *Account) Code(ctx context.Context) (hexutil.Bytes, error) {
@ -181,12 +181,12 @@ func (t *Transaction) InputData(ctx context.Context) (hexutil.Bytes, error) {
return hexutil.Bytes(tx.Data()), nil return hexutil.Bytes(tx.Data()), nil
} }
func (t *Transaction) Gas(ctx context.Context) (int32, error) { func (t *Transaction) Gas(ctx context.Context) (hexutil.Uint64, error) {
tx, err := t.resolve(ctx) tx, err := t.resolve(ctx)
if err != nil || tx == nil { if err != nil || tx == nil {
return 0, err return 0, err
} }
return int32(tx.Gas()), nil return hexutil.Uint64(tx.Gas()), nil
} }
func (t *Transaction) GasPrice(ctx context.Context) (hexutil.Big, error) { func (t *Transaction) GasPrice(ctx context.Context) (hexutil.Big, error) {
@ -205,12 +205,12 @@ func (t *Transaction) Value(ctx context.Context) (hexutil.Big, error) {
return hexutil.Big(*tx.Value()), nil return hexutil.Big(*tx.Value()), nil
} }
func (t *Transaction) Nonce(ctx context.Context) (int32, error) { func (t *Transaction) Nonce(ctx context.Context) (hexutil.Uint64, error) {
tx, err := t.resolve(ctx) tx, err := t.resolve(ctx)
if err != nil || tx == nil { if err != nil || tx == nil {
return 0, err return 0, err
} }
return int32(tx.Nonce()), nil return hexutil.Uint64(tx.Nonce()), nil
} }
func (t *Transaction) To(ctx context.Context, args BlockNumberArgs) (*Account, error) { func (t *Transaction) To(ctx context.Context, args BlockNumberArgs) (*Account, error) {
@ -285,33 +285,33 @@ func (t *Transaction) getReceipt(ctx context.Context) (*types.Receipt, error) {
return receipts[t.index], nil return receipts[t.index], nil
} }
func (t *Transaction) Status(ctx context.Context) (*int32, error) { func (t *Transaction) Status(ctx context.Context) (*hexutil.Uint64, error) {
receipt, err := t.getReceipt(ctx) receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil { if err != nil || receipt == nil {
return nil, err return nil, err
} }
ret := int32(receipt.Status) ret := hexutil.Uint64(receipt.Status)
return &ret, nil return &ret, nil
} }
func (t *Transaction) GasUsed(ctx context.Context) (*int32, error) { func (t *Transaction) GasUsed(ctx context.Context) (*hexutil.Uint64, error) {
receipt, err := t.getReceipt(ctx) receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil { if err != nil || receipt == nil {
return nil, err return nil, err
} }
ret := int32(receipt.GasUsed) ret := hexutil.Uint64(receipt.GasUsed)
return &ret, nil return &ret, nil
} }
func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*int32, error) { func (t *Transaction) CumulativeGasUsed(ctx context.Context) (*hexutil.Uint64, error) {
receipt, err := t.getReceipt(ctx) receipt, err := t.getReceipt(ctx)
if err != nil || receipt == nil { if err != nil || receipt == nil {
return nil, err return nil, err
} }
ret := int32(receipt.CumulativeGasUsed) ret := hexutil.Uint64(receipt.CumulativeGasUsed)
return &ret, nil return &ret, nil
} }
@ -396,7 +396,7 @@ func (b *Block) resolveReceipts(ctx context.Context) ([]*types.Receipt, error) {
return b.receipts, nil return b.receipts, nil
} }
func (b *Block) Number(ctx context.Context) (int32, error) { func (b *Block) Number(ctx context.Context) (hexutil.Uint64, error) {
if b.num == nil || *b.num == rpc.LatestBlockNumber { if b.num == nil || *b.num == rpc.LatestBlockNumber {
block, err := b.resolve(ctx) block, err := b.resolve(ctx)
if err != nil { if err != nil {
@ -405,7 +405,7 @@ func (b *Block) Number(ctx context.Context) (int32, error) {
num := rpc.BlockNumber(block.Number().Uint64()) num := rpc.BlockNumber(block.Number().Uint64())
b.num = &num b.num = &num
} }
return int32(*b.num), nil return hexutil.Uint64(*b.num), nil
} }
func (b *Block) Hash(ctx context.Context) (common.Hash, error) { func (b *Block) Hash(ctx context.Context) (common.Hash, error) {
@ -419,20 +419,20 @@ func (b *Block) Hash(ctx context.Context) (common.Hash, error) {
return b.hash, nil return b.hash, nil
} }
func (b *Block) GasLimit(ctx context.Context) (int32, error) { func (b *Block) GasLimit(ctx context.Context) (hexutil.Uint64, error) {
block, err := b.resolve(ctx) block, err := b.resolve(ctx)
if err != nil { if err != nil {
return 0, err return 0, err
} }
return int32(block.GasLimit()), nil return hexutil.Uint64(block.GasLimit()), nil
} }
func (b *Block) GasUsed(ctx context.Context) (int32, error) { func (b *Block) GasUsed(ctx context.Context) (hexutil.Uint64, error) {
block, err := b.resolve(ctx) block, err := b.resolve(ctx)
if err != nil { if err != nil {
return 0, err return 0, err
} }
return int32(block.GasUsed()), nil return hexutil.Uint64(block.GasUsed()), nil
} }
func (b *Block) Parent(ctx context.Context) (*Block, error) { func (b *Block) Parent(ctx context.Context) (*Block, error) {
@ -587,7 +587,7 @@ func (b *Block) TotalDifficulty(ctx context.Context) (hexutil.Big, error) {
} }
type BlockNumberArgs struct { type BlockNumberArgs struct {
Block *int32 Block *hexutil.Uint64
} }
func (a BlockNumberArgs) Number() rpc.BlockNumber { func (a BlockNumberArgs) Number() rpc.BlockNumber {
@ -687,7 +687,7 @@ type Resolver struct {
} }
type BlockArgs struct { type BlockArgs struct {
Number *int32 Number *hexutil.Uint64
Hash *common.Hash Hash *common.Hash
} }
@ -723,8 +723,8 @@ func (r *Resolver) Block(ctx context.Context, args BlockArgs) (*Block, error) {
} }
type BlocksArgs struct { type BlocksArgs struct {
From int32 From hexutil.Uint64
To *int32 To *hexutil.Uint64
} }
func (r *Resolver) Blocks(ctx context.Context, args BlocksArgs) ([]*Block, error) { func (r *Resolver) Blocks(ctx context.Context, args BlocksArgs) ([]*Block, error) {
@ -759,7 +759,7 @@ func (r *Resolver) Blocks(ctx context.Context, args BlocksArgs) ([]*Block, error
type AccountArgs struct { type AccountArgs struct {
Address common.Address Address common.Address
BlockNumber *int32 BlockNumber *hexutil.Uint64
} }
func (r *Resolver) Account(ctx context.Context, args AccountArgs) *Account { func (r *Resolver) Account(ctx context.Context, args AccountArgs) *Account {
@ -820,25 +820,25 @@ type CallData struct {
type CallResult struct { type CallResult struct {
data hexutil.Bytes data hexutil.Bytes
gasUsed int32 gasUsed hexutil.Uint64
status int32 status hexutil.Uint64
} }
func (c *CallResult) Data() hexutil.Bytes { func (c *CallResult) Data() hexutil.Bytes {
return c.data return c.data
} }
func (c *CallResult) GasUsed() int32 { func (c *CallResult) GasUsed() hexutil.Uint64 {
return c.gasUsed return c.gasUsed
} }
func (c *CallResult) Status() int32 { func (c *CallResult) Status() hexutil.Uint64 {
return c.status return c.status
} }
func (r *Resolver) Call(ctx context.Context, args struct { func (r *Resolver) Call(ctx context.Context, args struct {
Data ethapi.CallArgs Data ethapi.CallArgs
BlockNumber *int32 BlockNumber *hexutil.Uint64
}) (*CallResult, error) { }) (*CallResult, error) {
be, err := getBackend(r.node) be, err := getBackend(r.node)
if err != nil { if err != nil {
@ -851,21 +851,21 @@ func (r *Resolver) Call(ctx context.Context, args struct {
} }
result, gas, failed, err := ethapi.DoCall(ctx, be, args.Data, blockNumber, vm.Config{}, 5*time.Second) result, gas, failed, err := ethapi.DoCall(ctx, be, args.Data, blockNumber, vm.Config{}, 5*time.Second)
status := int32(1) status := hexutil.Uint64(1)
if failed { if failed {
status = 0 status = 0
} }
return &CallResult{ return &CallResult{
data: hexutil.Bytes(result), data: hexutil.Bytes(result),
gasUsed: int32(gas), gasUsed: hexutil.Uint64(gas),
status: status, status: status,
}, err }, err
} }
func (r *Resolver) EstimateGas(ctx context.Context, args struct { func (r *Resolver) EstimateGas(ctx context.Context, args struct {
Data ethapi.CallArgs Data ethapi.CallArgs
BlockNumber *int32 BlockNumber *hexutil.Uint64
}) (int32, error) { }) (hexutil.Uint64, error) {
be, err := getBackend(r.node) be, err := getBackend(r.node)
if err != nil { if err != nil {
return 0, err return 0, err
@ -877,7 +877,7 @@ func (r *Resolver) EstimateGas(ctx context.Context, args struct {
} }
gas, err := ethapi.DoEstimateGas(ctx, be, args.Data, blockNumber) gas, err := ethapi.DoEstimateGas(ctx, be, args.Data, blockNumber)
return int32(gas), err return hexutil.Uint64(gas), err
} }
func NewHandler(n *node.Node) (http.Handler, error) { func NewHandler(n *node.Node) (http.Handler, error) {
@ -898,14 +898,14 @@ func NewHandler(n *node.Node) (http.Handler, error) {
type Account { type Account {
address: Address! address: Address!
balance: BigInt! balance: BigInt!
transactionCount: Int! transactionCount: Long!
code: Bytes! code: Bytes!
storage(slot: Bytes32!): Bytes32! storage(slot: Bytes32!): Bytes32!
} }
type Log { type Log {
index: Int! index: Int!
account(block: Int): Account! account(block: Long): Account!
topics: [Bytes32!]! topics: [Bytes32!]!
data: Bytes! data: Bytes!
transaction: Transaction! transaction: Transaction!
@ -913,25 +913,25 @@ func NewHandler(n *node.Node) (http.Handler, error) {
type Transaction { type Transaction {
hash: Bytes32! hash: Bytes32!
nonce: Int! nonce: Long!
index: Int index: Int
from(block: Int): Account! from(block: Long): Account!
to(block: Int): Account to(block: Long): Account
value: BigInt! value: BigInt!
gasPrice: BigInt! gasPrice: BigInt!
gas: Int! gas: Long!
inputData: Bytes! inputData: Bytes!
block: Block block: Block
status: Int status: Long
gasUsed: Int gasUsed: Long
cumulativeGasUsed: Int cumulativeGasUsed: Long
createdContract(block: Int): Account createdContract(block: Long): Account
logs: [Log!] logs: [Log!]
} }
type Block { type Block {
number: Int! number: Long!
hash: Bytes32! hash: Bytes32!
parent: Block parent: Block
nonce: BigInt! nonce: BigInt!
@ -939,10 +939,10 @@ func NewHandler(n *node.Node) (http.Handler, error) {
transactionCount: Int! transactionCount: Int!
stateRoot: Bytes32! stateRoot: Bytes32!
receiptsRoot: Bytes32! receiptsRoot: Bytes32!
miner(block: Int): Account! miner(block: Long): Account!
extraData: Bytes! extraData: Bytes!
gasLimit: Int! gasLimit: Long!
gasUsed: Int! gasUsed: Long!
timestamp: BigInt! timestamp: BigInt!
logsBloom: Bytes! logsBloom: Bytes!
mixHash: Bytes32! mixHash: Bytes32!
@ -967,17 +967,17 @@ func NewHandler(n *node.Node) (http.Handler, error) {
type CallResult { type CallResult {
data: Bytes! data: Bytes!
gasUsed: Int! gasUsed: Long!
status: Int! status: Long!
} }
type Query { type Query {
account(address: Address!, blockNumber: Int): Account! account(address: Address!, blockNumber: Long): Account!
block(number: Int, hash: Bytes32): Block block(number: Long, hash: Bytes32): Block
blocks(from: Int!, to: Int): [Block!]! blocks(from: Long!, to: Long): [Block!]!
transaction(hash: Bytes32!): Transaction transaction(hash: Bytes32!): Transaction
call(data: CallData!, blockNumber: Int): CallResult call(data: CallData!, blockNumber: Long): CallResult
estimateGas(data: CallData!, blockNumber: Int): Int! estimateGas(data: CallData!, blockNumber: Long): Long!
} }
type Mutation { type Mutation {