Remove Static Fee Config #3610
Open
Remove Static Fee Config #3610
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samliok
commented
Dec 18, 2024
samliok
commented
Dec 18, 2024
samliok
force-pushed
the
static-fee-remove
branch
from
52c104b to
41aaaaa
Compare
Closed
| @@ -477,81 +442,6 @@ func TestExportTx(t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| func TestTransformSubnetTx(t *testing.T) { | |||
There was a problem hiding this comment.
If we are removing this test - should we also be removing NewTransformSubnetTx entirely? It feels odd to keep that function around but not to have any tests for it
There was a problem hiding this comment.
i agree, could this be done in a follow up? there seems to be a lot of references to TransformSubnetTx
There was a problem hiding this comment.
Yeah that's a reasonable followup
Comment on lines
1735
to
1784
| { | ||
| name: "valid tx", | ||
| newExecutor: func(ctrl *gomock.Controller) (*txs.RemoveSubnetValidatorTx, *standardTxExecutor) { | ||
| env := newValidRemoveSubnetValidatorTxVerifyEnv(t, ctrl) | ||
|
|
||
| // Set dependency expectations. | ||
| env.state.EXPECT().GetTimestamp().Return(env.latestForkTime).AnyTimes() | ||
| env.state.EXPECT().GetCurrentValidator(env.unsignedTx.Subnet, env.unsignedTx.NodeID).Return(env.staker, nil).Times(1) | ||
| subnetOwner := fxmock.NewOwner(ctrl) | ||
| env.state.EXPECT().GetSubnetOwner(env.unsignedTx.Subnet).Return(subnetOwner, nil).Times(1) | ||
| env.fx.EXPECT().VerifyPermission(env.unsignedTx, env.unsignedTx.SubnetAuth, env.tx.Creds[len(env.tx.Creds)-1], subnetOwner).Return(nil).Times(1) | ||
| env.flowChecker.EXPECT().VerifySpend( | ||
| env.unsignedTx, env.state, env.unsignedTx.Ins, env.unsignedTx.Outs, env.tx.Creds[:len(env.tx.Creds)-1], gomock.Any(), | ||
| ).Return(nil).Times(1) | ||
| env.state.EXPECT().DeleteCurrentValidator(env.staker) | ||
| env.state.EXPECT().DeleteUTXO(gomock.Any()).Times(len(env.unsignedTx.Ins)) | ||
| env.state.EXPECT().AddUTXO(gomock.Any()).Times(len(env.unsignedTx.Outs)) | ||
|
|
||
| // This isn't actually called, but is added here as a regression | ||
| // test to ensure that converted subnets can still remove | ||
| // permissioned validators. | ||
| env.state.EXPECT().GetSubnetToL1Conversion(env.unsignedTx.Subnet).Return( | ||
| state.SubnetToL1Conversion{ | ||
| ConversionID: ids.GenerateTestID(), | ||
| ChainID: ids.GenerateTestID(), | ||
| Addr: []byte("address"), | ||
| }, | ||
| nil, | ||
| ).AnyTimes() | ||
|
|
||
| cfg := &config.Internal{ | ||
| UpgradeConfig: upgradetest.GetConfigWithUpgradeTime(upgradetest.Etna, env.latestForkTime), | ||
| } | ||
| feeCalculator := state.NewStaticFeeCalculator(cfg, env.state.GetTimestamp()) | ||
| e := &standardTxExecutor{ | ||
| backend: &Backend{ | ||
| Config: cfg, | ||
| Bootstrapped: utils.NewAtomic(true), | ||
| Fx: env.fx, | ||
| FlowChecker: env.flowChecker, | ||
| Ctx: &snow.Context{}, | ||
| }, | ||
| feeCalculator: feeCalculator, | ||
| tx: env.tx, | ||
| state: env.state, | ||
| } | ||
| return env.unsignedTx, e | ||
| }, | ||
| expectedErr: nil, | ||
| }, |
There was a problem hiding this comment.
Shouldn't this still be able to be tested? (valid transactions)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why this should be merged
After the Etna update there is no longer use for the
staticFeeConfigas well as the static fee calculator. This PR removes these structs as well as cleans up the surrounding tests and configs.How this works
How this was tested
CI/CD
Need to be documented in RELEASES.md?
Yes