Update spvblock.py (Sourcery refactored) #653

sourcery-ai · 2022-12-19T15:08:41Z

Pull Request #652 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the SatoshiNakamotoBitcoin-patch-12 branch, then run:

git fetch origin sourcery/SatoshiNakamotoBitcoin-patch-12
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-        list = "curl -s 'https://bitcoinstrings.com/blk'" + responseC + """.txt | html2text | grep -v "blk" | grep -v "files" | grep -v "Advertisement" | grep -v "BitcoinStrings" """
+        list = f"""curl -s 'https://bitcoinstrings.com/blk'{responseC}.txt | html2text | grep -v "blk" | grep -v "files" | grep -v "Advertisement" | grep -v "BitcoinStrings" """


Function decodeStrDat refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-            list = "curl '" + lang + ".wttr.in/" + selectData2 + "?F&" + unit + "'"
+            list = f"curl '{lang}.wttr.in/{selectData2}?F&{unit}'"


Function wttrDataV1 refactored with the following changes:

Use f-string instead of string concatenation [×6] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-            list = "curl 'v2.wttr.in/" + selectData2 + "?" + unit + "&F&lang=" + lang + "'"
+            list = f"curl 'v2.wttr.in/{selectData2}?{unit}&F&lang={lang}'"


Function wttrDataV2 refactored with the following changes:

Use f-string instead of string concatenation [×6] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-            list = "curl -s '" + selectFiat + ".rate.sx/?F&n=1'"
+            list = f"curl -s '{selectFiat}.rate.sx/?F&n=1'"


Function rateSXList refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-            list = "curl -s '" + selectFiat + """.rate.sx/btc' | grep -v -E 'Use'"""
+            list = f"curl -s '{selectFiat}.rate.sx/btc' | grep -v -E 'Use'"


Function rateSXGraph refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:44Z

pybitblock/SPV/spvblock.py

-        list = "curl -s 'https://1ml.com/node/'"+ responseC +"""/json'"""
+        list = f"curl -s 'https://1ml.com/node/'{responseC}/json'"


Function getinfo refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:45Z

pybitblock/SPV/spvblock.py

-        list = "curl -s 'https://mempool.space/api/tx/" + responseC + """/hex' """
+        list = f"curl -s 'https://mempool.space/api/tx/{responseC}/hex' "


Function readHexBlock refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:45Z

pybitblock/SPV/spvblock.py

-        list = "curl -s 'https://bitcoinexplorer.org/rpc-browser?method=" + responseC + """#Help-Content' | html2text | grep -E "Arguments" -A 777 | grep -E -v "Recent|https|http|version|commit|released|Hidden Service|on Twitter|explorer|###### Project|###### App Details|###### Links" """
+        list = f"""curl -s 'https://bitcoinexplorer.org/rpc-browser?method={responseC}#Help-Content' | html2text | grep -E "Arguments" -A 777 | grep -E -v "Recent|https|http|version|commit|released|Hidden Service|on Twitter|explorer|###### Project|###### App Details|###### Links" """


Function console refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:08:45Z

pybitblock/SPV/spvblock.py

-        list = "curl -s 'https://bitcoinexplorer.org/api/block/'" + responseC + """ | jq -C '.[]' | tr -d '{|}|]|,'"""
+        list = (
+            f"curl -s 'https://bitcoinexplorer.org/api/block/'{responseC}"
+            + """ | jq -C '.[]' | tr -d '{|}|]|,'"""
+        )


Function decodeHex refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

sourcery-ai · 2022-12-19T15:09:10Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.01%.

Quality metrics	Before	After	Change
Complexity	7.22 ⭐	7.22 ⭐	0.00
Method Length	92.34 🙂	92.33 🙂	-0.01 👍
Working memory	9.33 🙂	9.33 🙂	0.00
Quality	62.18% 🙂	62.19% 🙂	0.01% 👍

Other metrics	Before	After	Change
Lines	7249	7252	3

Changed files	Quality Before	Quality After	Quality Change
pybitblock/SPV/spvblock.py	62.18% 🙂	62.19% 🙂	0.01% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
pybitblock/SPV/spvblock.py	OpenNodecreatecharge	42 ⛔	644 ⛔	26 ⛔	6.72% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
pybitblock/SPV/spvblock.py	lightningnetworkLOCALcontrol	25 😞	320 ⛔	24 ⛔	17.27% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
pybitblock/SPV/spvblock.py	OpenNodeiniciatewithdrawal	17 🙂	396 ⛔	19 ⛔	23.83% ⛔	Try splitting into smaller methods. Extract out complex expressions
pybitblock/SPV/spvblock.py	bitcoincoremenuLOCALcontrolAOnchainONLY	24 😞	215 ⛔	19 ⛔	25.16% 😞	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
pybitblock/SPV/spvblock.py	lnbitCreatePayWall	18 🙂	274 ⛔	20 ⛔	25.46% 😞	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

'Refactored by Sourcery'

42fa1eb

sourcery-ai bot requested a review from SatoshiNakamotoBitcoin December 19, 2022 15:08

sourcery-ai bot commented Dec 19, 2022

View reviewed changes

curly60e merged commit a8dbdcf into SatoshiNakamotoBitcoin-patch-12 Dec 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update spvblock.py (Sourcery refactored) #653

Update spvblock.py (Sourcery refactored) #653

sourcery-ai bot commented Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot Dec 19, 2022

sourcery-ai bot commented Dec 19, 2022

		list = "curl -s 'https://bitcoinstrings.com/blk'" + responseC + """.txt \| html2text \| grep -v "blk" \| grep -v "files" \| grep -v "Advertisement" \| grep -v "BitcoinStrings" """
		list = f"""curl -s 'https://bitcoinstrings.com/blk'{responseC}.txt \| html2text \| grep -v "blk" \| grep -v "files" \| grep -v "Advertisement" \| grep -v "BitcoinStrings" """

		list = "curl '" + lang + ".wttr.in/" + selectData2 + "?F&" + unit + "'"
		list = f"curl '{lang}.wttr.in/{selectData2}?F&{unit}'"

		list = "curl 'v2.wttr.in/" + selectData2 + "?" + unit + "&F&lang=" + lang + "'"
		list = f"curl 'v2.wttr.in/{selectData2}?{unit}&F&lang={lang}'"

		list = "curl -s '" + selectFiat + ".rate.sx/?F&n=1'"
		list = f"curl -s '{selectFiat}.rate.sx/?F&n=1'"

		list = "curl -s '" + selectFiat + """.rate.sx/btc' \| grep -v -E 'Use'"""
		list = f"curl -s '{selectFiat}.rate.sx/btc' \| grep -v -E 'Use'"

		list = "curl -s 'https://1ml.com/node/'"+ responseC +"""/json'"""
		list = f"curl -s 'https://1ml.com/node/'{responseC}/json'"

		list = "curl -s 'https://mempool.space/api/tx/" + responseC + """/hex' """
		list = f"curl -s 'https://mempool.space/api/tx/{responseC}/hex' "

		list = "curl -s 'https://bitcoinexplorer.org/rpc-browser?method=" + responseC + """#Help-Content' \| html2text \| grep -E "Arguments" -A 777 \| grep -E -v "Recent\|https\|http\|version\|commit\|released\|Hidden Service\|on Twitter\|explorer\|###### Project\|###### App Details\|###### Links" """
		list = f"""curl -s 'https://bitcoinexplorer.org/rpc-browser?method={responseC}#Help-Content' \| html2text \| grep -E "Arguments" -A 777 \| grep -E -v "Recent\|https\|http\|version\|commit\|released\|Hidden Service\|on Twitter\|explorer\|###### Project\|###### App Details\|###### Links" """

Update spvblock.py (Sourcery refactored) #653

Update spvblock.py (Sourcery refactored) #653

Conversation

sourcery-ai bot commented Dec 19, 2022

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot Dec 19, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Dec 19, 2022

Sourcery Code Quality Report

Legend and Explanation