From 3c9d3b52b06c8e588269edb0001f4e45cb4f8391 Mon Sep 17 00:00:00 2001 From: philip-morlier Date: Tue, 20 Feb 2024 13:17:11 -0800 Subject: [PATCH] Added IsShanghai to test, increased size of hookChan in test to occomodate. --- plugins/test-plugin/hooks.go | 18 +++++++++++++++--- plugins/test-plugin/main.go | 8 +++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/test-plugin/hooks.go b/plugins/test-plugin/hooks.go index c2ffd64cf..02878fbdc 100644 --- a/plugins/test-plugin/hooks.go +++ b/plugins/test-plugin/hooks.go @@ -243,7 +243,8 @@ func RPCSubscriptionTest() { // params/ -func Is1559(*big.Int) bool { // while this hook resides in params the injections are in consensus/misc/ (2), and core/ (2) and miner/ (1) +// Is1559 is written in params/ the injections are in: consensus/misc/ (2), and core/ (2) and miner/ (1) +func Is1559(*big.Int) bool { m := map[string]struct{}{ "Is1559":struct{}{}, } @@ -251,9 +252,19 @@ func Is1559(*big.Int) bool { // while this hook resides in params the injections return true } +// the following two hooks are both testing the PluginEIPCheck() hook + func Is160(num *big.Int) bool { m := map[string]struct{}{ - "PluginEIPCheck":struct{}{}, + "Is160":struct{}{}, + } + hookChan <- m + return true +} + +func IsShanghai(num *big.Int) bool { + m := map[string]struct{}{ + "IsShanghai":struct{}{}, } hookChan <- m return true @@ -300,6 +311,7 @@ var plugins map[string]struct{} = map[string]struct{}{ "ForkIDs": struct{}{}, "OpCodeSelect":struct{}{}, "Is1559":struct{}{}, - "PluginEIPCheck":struct{}{}, + "Is160":struct{}{}, + "IsShanghai":struct{}{}, } diff --git a/plugins/test-plugin/main.go b/plugins/test-plugin/main.go index 30f272606..70b813932 100644 --- a/plugins/test-plugin/main.go +++ b/plugins/test-plugin/main.go @@ -12,7 +12,7 @@ import ( "github.com/openrelayxyz/plugeth-utils/restricted/crypto" ) -var hookChan chan map[string]struct{} = make(chan map[string]struct{}, 10) +var hookChan chan map[string]struct{} = make(chan map[string]struct{}, 20) var quit chan string = make(chan string) func (service *engineService) CaptureShutdown(ctx context.Context) { @@ -136,8 +136,10 @@ func BlockChain() { delete(plugins, "OpCodeSelect") case f("Is1559"): delete(plugins, "Is1559") - case f("PluginEIPCheck"): - delete(plugins, "PluginEIPCheck") + case f("Is160"): + delete(plugins, "Is160") + case f("IsShanghai"): + delete(plugins, "IsShanghai") } } }