refactored CallFunc

lmittmann · Aug 31, 2023 · 95ee218 · 95ee218
1 parent 990d7ad
commit 95ee218
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/module/eth/call.go b/module/eth/call.go
@@ -92,14 +92,16 @@ func msgArgsWrapper(slice []any) ([]any, error) {
 // CallFunc requests the returns of Func f at common.Address contract with the
 // given args.
 func CallFunc(contract common.Address, f w3types.Func, args ...any) *CallFuncFactory {
- return &CallFuncFactory{contract: contract, f: f, args: args}
+ return &CallFuncFactory{msg: &w3types.Message{
+ To: &contract,
+ Func: f,
+ Args: args,
+ }}
 }
 
 type CallFuncFactory struct {
  // args
- contract common.Address
- f w3types.Func
- args []any
+ msg *w3types.Message
  atBlock *big.Int
  overrides w3types.State
 
@@ -124,16 +126,14 @@ func (f *CallFuncFactory) Overrides(overrides w3types.State) *CallFuncFactory {
 }
 
 func (f *CallFuncFactory) CreateRequest() (rpc.BatchElem, error) {
- input, err := f.f.EncodeArgs(f.args...)
+ input, err := f.msg.Func.EncodeArgs(f.msg.Args...)
  if err != nil {
  return rpc.BatchElem{}, err
  }
+ f.msg.Input = input
 
  args := []any{
- &w3types.Message{
- To: &f.contract,
- Input: input,
- },
+ f.msg,
  module.BlockNumberArg(f.atBlock),
  }
  if len(f.overrides) > 0 {
@@ -152,7 +152,7 @@ func (f *CallFuncFactory) HandleResponse(elem rpc.BatchElem) error {
  return err
  }
 
- if err := f.f.DecodeReturns(f.result, f.returns...); err != nil {
+ if err := f.msg.Func.DecodeReturns(f.result, f.returns...); err != nil {
  return err
  }
  return nil