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

Move some single use args types into anonymous structs

Browse source
This commit is contained in:
Nick Johnson 2018-10-16 20:42:01 +01:00
parent c3387f8d0c
commit a79bacd7e2
1 changed files with 10 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ethgraphql/main.go
View file

@ -97,11 +97,7 @@ func (a *Account) Code(ctx context.Context) (hexutil.Bytes, error) {
return hexutil.Bytes(state.GetCode(a.address)), nil return hexutil.Bytes(state.GetCode(a.address)), nil
} }
type StorageSlotArgs struct { func (a *Account) Storage(ctx context.Context, args struct{ Slot common.Hash }) (common.Hash, error) {
Slot common.Hash
}
func (a *Account) Storage(ctx context.Context, args StorageSlotArgs) (common.Hash, error) {
state, err := a.getState(ctx) state, err := a.getState(ctx)
if err != nil { if err != nil {
return common.Hash{}, err return common.Hash{}, err
@ -652,11 +648,7 @@ func (b *Block) Transactions(ctx context.Context) (*[]*Transaction, error) {
return &ret, nil return &ret, nil
} }
type ArrayIndexArgs struct { func (b *Block) TransactionAt(ctx context.Context, args struct{ Index int32 }) (*Transaction, error) {
Index int32
}
func (b *Block) TransactionAt(ctx context.Context, args ArrayIndexArgs) (*Transaction, error) {
block, err := b.resolve(ctx) block, err := b.resolve(ctx)
if err != nil || block == nil { if err != nil || block == nil {
return nil, err return nil, err
@ -677,7 +669,7 @@ func (b *Block) TransactionAt(ctx context.Context, args ArrayIndexArgs) (*Transa
}, nil }, nil
} }
func (b *Block) OmmerAt(ctx context.Context, args ArrayIndexArgs) (*Block, error) { func (b *Block) OmmerAt(ctx context.Context, args struct{ Index int32 }) (*Block, error) {
block, err := b.resolve(ctx) block, err := b.resolve(ctx)
if err != nil || block == nil { if err != nil || block == nil {
return nil, err return nil, err
@ -768,12 +760,10 @@ type Resolver struct {
node *node.Node node *node.Node
} }
type BlockArgs struct { func (r *Resolver) Block(ctx context.Context, args struct {
Number *hexutil.Uint64 Number *hexutil.Uint64
Hash *common.Hash Hash *common.Hash
} }) (*Block, error) {
func (r *Resolver) Block(ctx context.Context, args BlockArgs) (*Block, error) {
var block *Block var block *Block
if args.Number != nil { if args.Number != nil {
num := rpc.BlockNumber(uint64(*args.Number)) num := rpc.BlockNumber(uint64(*args.Number))
@ -804,12 +794,10 @@ func (r *Resolver) Block(ctx context.Context, args BlockArgs) (*Block, error) {
return block, nil return block, nil
} }
type BlocksArgs struct { func (r *Resolver) Blocks(ctx context.Context, args struct {
From hexutil.Uint64 From hexutil.Uint64
To *hexutil.Uint64 To *hexutil.Uint64
} }) ([]*Block, error) {
func (r *Resolver) Blocks(ctx context.Context, args BlocksArgs) ([]*Block, error) {
be, err := getBackend(r.node) be, err := getBackend(r.node)
if err != nil { if err != nil {
return nil, err return nil, err
@ -839,12 +827,10 @@ func (r *Resolver) Blocks(ctx context.Context, args BlocksArgs) ([]*Block, error
return ret, nil return ret, nil
} }
type AccountArgs struct { func (r *Resolver) Account(ctx context.Context, args struct {
Address common.Address Address common.Address
BlockNumber *hexutil.Uint64 BlockNumber *hexutil.Uint64
} }) *Account {
func (r *Resolver) Account(ctx context.Context, args AccountArgs) *Account {
blockNumber := rpc.LatestBlockNumber blockNumber := rpc.LatestBlockNumber
if args.BlockNumber != nil { if args.BlockNumber != nil {
blockNumber = rpc.BlockNumber(*args.BlockNumber) blockNumber = rpc.BlockNumber(*args.BlockNumber)
@ -857,11 +843,7 @@ func (r *Resolver) Account(ctx context.Context, args AccountArgs) *Account {
} }
} }
type TransactionArgs struct { func (r *Resolver) Transaction(ctx context.Context, args struct{ Hash common.Hash }) (*Transaction, error) {
Hash common.Hash
}
func (r *Resolver) Transaction(ctx context.Context, args TransactionArgs) (*Transaction, error) {
tx := &Transaction{ tx := &Transaction{
node: r.node, node: r.node,
hash: args.Hash, hash: args.Hash,