Fixed chifra abis --find tests

src/apps/chifra/internal/abis/handle_addresses.go

@@ -13,9 +13,8 @@ import (
  "github.com/ethereum/go-ethereum/common"
 )
 
-var testMode = os.Getenv("TEST_MODE") == "true"
-
 func (opts *AbisOptions) HandleAddresses() (err error) {
+ testMode := opts.Globals.TestMode
  result := make(abi.AbiInterfaceMap)
  if opts.Known {
  if err = abi.PreloadKnownAbis(opts.Globals.Chain, result, false); err != nil {

src/apps/chifra/internal/abis/handle_find.go

@@ -7,6 +7,7 @@ package abisPkg
 import (
  "bufio"
  "bytes"
+ "context"
  "encoding/hex"
  "io"
  "os"
@@ -18,95 +19,123 @@ import (
  "github.com/ethereum/go-ethereum/crypto"
  ants "github.com/panjf2000/ants/v2"
 
- "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/internal/globals"
  "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/config"
  "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/logger"
+ "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/output"
  "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/progress"
  "github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
 )
 
 func (opts *AbisOptions) HandleAbiFind() error {
+ testMode := opts.Globals.TestMode
  /* wanted */ /* freq */ /* max */
  scanBar := progress.NewScanBar(uint64(len(opts.Find)), 13919, 50000000, .5)
 
- // TODO: SimpleFunctionOutput is a temporary fix for outputing ABIs, we can remove it
- // TODO: once we start using StreamMany in this code
- var results []types.SimpleFunctionOutput
-
- var wg sync.WaitGroup
- checkOne, _ := ants.NewPoolWithFunc(runtime.NumCPU()*2, func(testSig interface{}) {
- defer wg.Done()
- byts := []byte(testSig.(string))
- sigBytes := crypto.Keccak256(byts)
- for _, arg := range opts.Find {
- if !opts.Globals.TestMode {
- scanBar.Report(os.Stderr, "Scanning", testSig.(string))
- }
- str, _ := hex.DecodeString(arg[2:])
- if bytes.Equal(sigBytes[:len(str)], str) {
- scanBar.Found++
- if len(opts.Find) < 2 || !opts.Globals.TestMode {
- logger.Log(logger.Progress, "Found ", scanBar.Found, " of ", scanBar.Wanted, arg, testSig)
+ ctx, cancel := context.WithCancel(context.Background())
+ fetchData := func(modelChan chan types.Modeler[types.RawFunction], errorChan chan error) {
+ var results []types.SimpleFunction
+ var wg sync.WaitGroup
+ mutex := sync.Mutex{}
+ checkOne, _ := ants.NewPoolWithFunc(runtime.NumCPU()*2, func(testSig interface{}) {
+ defer wg.Done()
+ byts := []byte(testSig.(string))
+ sigBytes := crypto.Keccak256(byts)
+ for _, arg := range opts.Find {
+ if !opts.Globals.TestMode {
+ scanBar.Report(os.Stderr, "Scanning", testSig.(string))
+ }
+ str, _ := hex.DecodeString(arg[2:])
+ if bytes.Equal(sigBytes[:len(str)], str) {
+ scanBar.Found++
+ if len(opts.Find) < 2 || !opts.Globals.TestMode {
+ logger.Log(logger.Progress, "Found ", scanBar.Found, " of ", scanBar.Wanted, arg, testSig)
+ }
+ found := types.SimpleFunction{Encoding: arg, Signature: testSig.(string)}
+ if testMode {
+ mutex.Lock()
+ results = append(results, found)
+ mutex.Unlock()
+ } else {
+ modelChan <- &found
+ }
+ return
  }
- results = append(results, types.SimpleFunctionOutput{Encoding: arg, Signature: testSig.(string)})
- return
  }
+ })
+ defer checkOne.Release()
+
+ // TODO: UnchainedIndex --> This could be part of unchained index
+ sigsFile, err := os.OpenFile(config.GetPathToRootConfig()+"abis/known-000/uniq_sigs.tab", os.O_RDONLY, 0)
+ if err != nil {
+ errorChan <- err
+ cancel()
+ return
  }
- })
- defer checkOne.Release()
-
- // TODO: UnchainedIndex --> This could be part of unchained index
- sigsFile, err := os.OpenFile(config.GetPathToRootConfig()+"abis/known-000/uniq_sigs.tab", os.O_RDONLY, 0)
- if err != nil {
- return err
- }
- defer func() {
- sigsFile.Close()
- }()
- sigsFile.Seek(0, io.SeekStart)
- sigsScanner := bufio.NewScanner(sigsFile)
- sigsScanner.Split(bufio.ScanLines)
-
- // TODO: UnchainedIndex --> This could be part of unchained index
- funcsFile, _ := os.OpenFile(config.GetPathToRootConfig()+"abis/known-000/uniq_funcs.tab", os.O_RDONLY, 0)
- defer func() {
- funcsFile.Close()
- }()
-
- for sigsScanner.Scan() {
- s := sigsScanner.Text()
- hitsSignature := opts.hitsHint(s)
-
- funcsFile.Seek(0, io.SeekStart)
- funcsScanner := bufio.NewScanner(funcsFile)
- funcsScanner.Split(bufio.ScanLines)
-
- for funcsScanner.Scan() {
- f := funcsScanner.Text()
- hitsFunction := opts.hitsHint(f)
- if hitsSignature || hitsFunction {
- wg.Add(1)
- call := f + "(" + s + ")"
- _ = checkOne.Invoke(call)
+ defer func() {
+ sigsFile.Close()
+ }()
+ sigsFile.Seek(0, io.SeekStart)
+ sigsScanner := bufio.NewScanner(sigsFile)
+ sigsScanner.Split(bufio.ScanLines)
+
+ // TODO: UnchainedIndex --> This could be part of unchained index
+ funcsFile, _ := os.OpenFile(config.GetPathToRootConfig()+"abis/known-000/uniq_funcs.tab", os.O_RDONLY, 0)
+ defer func() {
+ funcsFile.Close()
+ }()
+
+ for sigsScanner.Scan() {
+ s := sigsScanner.Text()
+ hitsSignature := opts.hitsHint(s)
+
+ funcsFile.Seek(0, io.SeekStart)
+ funcsScanner := bufio.NewScanner(funcsFile)
+ funcsScanner.Split(bufio.ScanLines)
+
+ for funcsScanner.Scan() {
+ f := funcsScanner.Text()
+ hitsFunction := opts.hitsHint(f)
+ if hitsSignature || hitsFunction {
+ wg.Add(1)
+ call := f + "(" + s + ")"
+ _ = checkOne.Invoke(call)
+ }
  }
- }
 
- if scanBar.Satisfied() {
- break
+ if scanBar.Satisfied() {
+ break
+ }
  }
- }
 
- defer wg.Wait()
+  defer wg.Wait()
 
- if opts.Globals.TestMode {
- // Otherwise the test is not reproducable
- sort.Slice(results, func(i, j int) bool {
- return results[i].Signature < results[j].Signature
- })
+ if opts.Globals.TestMode {
+ // Otherwise the test is not reproducable
+ sort.Slice(results, func(i, j int) bool {
+ return results[i].Signature < results[j].Signature
+ })
+ for _, item := range results {
+ modelChan <- &item
+ }
+ }
  }
 
- // TODO: Fix export without arrays
- return globals.RenderSlice(&opts.Globals, results)
+ return output.StreamMany(ctx, fetchData, output.OutputOptions{
+ Writer: opts.Globals.Writer,
+ Chain: opts.Globals.Chain,
+ TestMode: opts.Globals.TestMode,
+ NoHeader: opts.Globals.NoHeader,
+ ShowRaw: opts.Globals.ShowRaw,
+ Verbose: opts.Globals.Verbose,
+ LogLevel: opts.Globals.LogLevel,
+ Format: opts.Globals.Format,
+ OutputFn: opts.Globals.OutputFn,
+ Append: opts.Globals.Append,
+ JsonIndent: " ",
+ Extra: map[string]interface{}{
+ "encodingSignatureOnly": true,
+ },
+ })
 }
 
 func (opts *AbisOptions) hitsHint(test string) bool {

src/apps/chifra/internal/globals/output.go

@@ -22,7 +22,6 @@ func RenderSlice[
  types.ReportClean |
  types.ReportCheck |
  types.SimpleFunction |
- types.SimpleFunctionOutput |
  types.SimpleMonitor |
  types.SimpleChunkRecord |
  types.SimpleAppearance |

src/apps/chifra/pkg/types/types_function.go

@@ -126,6 +126,17 @@ func joinParametersNames(params []SimpleParameter) (result string) {
 }
 
 func (s *SimpleFunction) Model(showHidden bool, format string, extraOptions map[string]any) Model {
+ // Used by chifra abis --find
+ if extraOptions["encodingSignatureOnly"] == true {
+ return Model{
+ Data: map[string]any{
+ "encoding": s.Encoding,
+ "signature": s.Signature,
+ },
+ Order: []string{"encoding", "signature"},
+ }
+ }
+
  model := map[string]interface{}{
  "name": s.Name,
  "type": s.FunctionType,
@@ -172,9 +183,3 @@ func (s *SimpleFunction) Model(showHidden bool, format string, extraOptions map[
  Order: order,
  }
 }
-
-// TODO: remove this type when we move ABI output to StreamMany
-type SimpleFunctionOutput struct {
- Encoding string `json:"encoding,omitempty"`
- Signature string `json:"signature,omitempty"`
-}

test/gold/tools/grabABI/api_tests/grabABI_findSig_csv.txt

@@ -1,3 +1,3 @@
 abis?find=0x1aa3a008&fmt=csv
-"encoding","signature"
-"0x1aa3a008","register()"
+encoding,signature
+0x1aa3a008,register()

test/gold/tools/grabABI/grabABI_findSig_csv.txt

@@ -1,5 +1,5 @@
 chifra abis --find 0x1aa3a008 --fmt csv
 TEST[DATE|TIME] Find: [0x1aa3a008]
 TEST[DATE|TIME] Format: csv
-PROG[DATE|TIME] Found 1 of 10x1aa3a008register()"encoding","signature"
-"0x1aa3a008","register()"
+PROG[DATE|TIME] Found 1 of 10x1aa3a008register()encoding,signature
+0x1aa3a008,register()