Skip to content

Remove FEEFILTER code#2025

Merged
UdjinM6 merged 2 commits intodashpay:developfrom
codablock:pr_disable_feefilter
Apr 11, 2018
Merged

Remove FEEFILTER code#2025
UdjinM6 merged 2 commits intodashpay:developfrom
codablock:pr_disable_feefilter

Conversation

@codablock
Copy link

Until we clarify if https://jasonc.me/blog/bitcoin-bip-133-double-spends-bch
is really a problem for us.

Copy link

@nmarley nmarley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

(Though I prefer smaller diff by keeping protocol version to 99999)

@codablock
Copy link
Author

As discussed in Slack, it would be better to completely remove the FEEFILTER code. I'll do this now and rename the PR accordingly.

@codablock codablock force-pushed the pr_disable_feefilter branch from 15e88ec to 7e51728 Compare April 11, 2018 06:51
@codablock codablock changed the title Comment out FEEFILTER for now Remove FEEFILTER code Apr 11, 2018
@codablock
Copy link
Author

Updated the PR to completely remove the FEEFILTER code

@codablock codablock force-pushed the pr_disable_feefilter branch from 7e51728 to 1e94f56 Compare April 11, 2018 06:56
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few leftovers otherwise looks good 👍

diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index b978f7d5c..f280ad67f 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -182,7 +182,6 @@ testScriptsExt = [
     'p2p-timeouts.py',
     # vv Tests less than 60s vv
     'bip9-softforks.py',
-    'p2p-feefilter.py',
     'rpcbind_test.py',
     # vv Tests less than 30s vv
     'bip65-cltv.py',
diff --git a/qa/rpc-tests/p2p-leaktests.py b/qa/rpc-tests/p2p-leaktests.py
index 41ca84d77..b9d8e851a 100755
--- a/qa/rpc-tests/p2p-leaktests.py
+++ b/qa/rpc-tests/p2p-leaktests.py
@@ -55,7 +55,6 @@ class CLazyNode(NodeConnCB):
     def on_ping(self, conn, message): self.bad_message(message)
     def on_mempool(self, conn): self.bad_message(message)
     def on_pong(self, conn, message): self.bad_message(message)
-    def on_feefilter(self, conn, message): self.bad_message(message)
     def on_sendheaders(self, conn, message): self.bad_message(message)
     def on_sendcmpct(self, conn, message): self.bad_message(message)
     def on_cmpctblock(self, conn, message): self.bad_message(message)

@UdjinM6 UdjinM6 added this to the 12.3 milestone Apr 11, 2018
@codablock codablock force-pushed the pr_disable_feefilter branch from 1e94f56 to 200253b Compare April 11, 2018 10:04
@codablock
Copy link
Author

@UdjinM6 Sorry, missed these 2. Fixed and force pushed :)

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

utACK

@UdjinM6
Copy link

UdjinM6 commented Apr 11, 2018

Needs rebase

@gladcow
Copy link

gladcow commented Apr 11, 2018

utACK

@UdjinM6
Copy link

UdjinM6 commented Apr 11, 2018

This one was caused by cmctblock merge, so was a trivial one. Fixed it via github GUI.

@UdjinM6 UdjinM6 merged commit 8b4c419 into dashpay:develop Apr 11, 2018
@codablock codablock deleted the pr_disable_feefilter branch April 24, 2018 04:13
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Mar 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants