Cleans up a couple of simple bugs

TrueBlocks · Sep 25, 2023 · 327edf5 · 327edf5
1 parent 8e99a43
commit 327edf5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/apps/chifra/pkg/rpc/ens.go b/src/apps/chifra/pkg/rpc/ens.go
@@ -22,7 +22,10 @@ func (conn *Connection) GetEnsAddresses(addrs []string) (out []string, found boo
 		}
 	}
 	if !has {
-		return addrs, false
+		for _, term := range addrs {
+			out = append(out, utils.LowerIfHex(term))
+		}
+		return out, false
 	}
 
 	// Note: we use ENS on mainnet always

diff --git a/src/apps/chifra/pkg/rpc/etherscan.go b/src/apps/chifra/pkg/rpc/etherscan.go
@@ -115,12 +115,12 @@ func (conn *Connection) rawToSimple(addr, requestType string, rawTx *types.RawSl
 	if requestType == "int" {
 		// We use a weird marker here since Etherscan doesn't send the transaction id for internal txs and we don't want to make another RPC call
 		// We tried (see commented code), but EtherScan balks with a weird message
-		s.TransactionIndex = 80809
+		s.TransactionIndex = types.EsInternalTx
 		// s.BlockHash = base.HexToHash("0xdeadbeef")
 		// got, err := conn.GetESTransactionByHash(s.Hash)
 		// if err != nil {
 		// 	logger.Warn("error getting transaction from etherscan:", err)
-		// 	s.TransactionIndex = 80809
+		// 	s.TransactionIndex = EsInternalTx
 		// } else {
 		// 	s.TransactionIndex = utils.MustParseUint(got.TransactionIndex)
 		// }

diff --git a/src/dev_tools/testRunner/options.cpp b/src/dev_tools/testRunner/options.cpp
@@ -42,7 +42,7 @@ bool COptions::parseArguments(string_q& command) {
 
     bool hasKey = getGlobalConfig("")->getConfigStr("keys.etherscan", "apiKey", "<not_set>") != "<not_set>";
     bool wantsTest = getEnvStr("TEST_SLURPS") == "true";
-    bool runSlurps = true || (hasKey && wantsTest);
+    bool runSlurps = (hasKey && wantsTest);
 
     CToml config(rootConfigToml_makeClass);
 

diff --git a/src/dev_tools/testRunner/testCases/apps/blockScrape.csv b/src/dev_tools/testRunner/testCases/apps/blockScrape.csv
@@ -41,10 +41,10 @@ off     ,both ,fast  ,scrape ,apps/blockScrape ,real_run2                    ,n
 
 on      ,both ,fast  ,scrape ,apps/blockScrape ,by_file_bad                  ,n    ,file = cmd_file_2
 
-on      ,both ,fast  ,scrape ,apps/blockScrape ,options_defaults             ,n    ,dry_run
-on      ,both ,fast  ,scrape ,apps/blockScrape ,options_with_env             ,n    ,dry_run
-on      ,both ,fast  ,scrape ,apps/blockScrape ,options_cmd_line             ,n    ,dry_run & apps_per_chunk 10000 & snap_to_grid 10000 & first_snap 10000 & unripe_dist 10000 & channel_count 10000
-on      ,both ,fast  ,scrape ,apps/blockScrape ,options_combo                ,n    ,dry_run & apps_per_chunk 10000 & snap_to_grid 10000 & first_snap 10000
+local   ,both ,fast  ,scrape ,apps/blockScrape ,options_defaults             ,n    ,dry_run
+local   ,both ,fast  ,scrape ,apps/blockScrape ,options_with_env             ,n    ,dry_run
+local   ,both ,fast  ,scrape ,apps/blockScrape ,options_cmd_line             ,n    ,dry_run & apps_per_chunk 10000 & snap_to_grid 10000 & first_snap 10000 & unripe_dist 10000 & channel_count 10000
+local   ,both ,fast  ,scrape ,apps/blockScrape ,options_combo                ,n    ,dry_run & apps_per_chunk 10000 & snap_to_grid 10000 & first_snap 10000
 
 # Capabilities
 # chain & fmt & help & nocolor & noop & version & verbose & no_header & file & output & append & cache & decache & raw & ether & wei

diff --git a/test/gold/tools/ethNames/ethNames_ens_test.txt b/test/gold/tools/ethNames/ethNames_ens_test.txt
@@ -1,5 +1,5 @@
 chifra names  wolfofethereum.eth
-TEST[DATE|TIME] Terms:  [wolfofethereum.eth]
+TEST[DATE|TIME] Terms:  [0x0559a413a3ab19508a144aeebc474eb14c5e76ce]
 TEST[DATE|TIME] Format:  txt
 tags	address	name	symbol	decimals	petname
 31-Gitcoin:Grants	0x0559a413a3ab19508a144aeebc474eb14c5e76ce	Grant 0386 Wolfofethereum.eth			arguably-actual-gar