export CalculateDynamicFee (#259)

ava-labs · Jun 15, 2023 · 0d02ea7 · 0d02ea7
1 parent 0eb8685
commit 0d02ea7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/plugin/evm/export_tx.go b/plugin/evm/export_tx.go
@@ -193,7 +193,7 @@ func (utx *UnsignedExportTx) SemanticVerify(
  if err != nil {
  return err
  }
- txFee, err := calculateDynamicFee(gasUsed, baseFee)
+ txFee, err := CalculateDynamicFee(gasUsed, baseFee)
  if err != nil {
  return err
  }

diff --git a/plugin/evm/export_tx_test.go b/plugin/evm/export_tx_test.go
@@ -1617,7 +1617,7 @@ func TestExportTxGasCost(t *testing.T) {
  t.Fatalf("Expected gasUsed to be %d, but found %d", test.ExpectedGasUsed, gasUsed)
  }
 
- fee, err := calculateDynamicFee(gasUsed, test.BaseFee)
+ fee, err := CalculateDynamicFee(gasUsed, test.BaseFee)
  if err != nil {
  t.Fatal(err)
  }

diff --git a/plugin/evm/import_tx.go b/plugin/evm/import_tx.go
@@ -194,7 +194,7 @@ func (utx *UnsignedImportTx) SemanticVerify(
  if err != nil {
  return err
  }
- txFee, err := calculateDynamicFee(gasUsed, baseFee)
+ txFee, err := CalculateDynamicFee(gasUsed, baseFee)
  if err != nil {
  return err
  }
@@ -375,11 +375,11 @@ func (vm *VM) newImportTxWithUTXOs(
  }
  gasUsedWithChange := gasUsedWithoutChange + EVMOutputGas
 
- txFeeWithoutChange, err = calculateDynamicFee(gasUsedWithoutChange, baseFee)
+ txFeeWithoutChange, err = CalculateDynamicFee(gasUsedWithoutChange, baseFee)
  if err != nil {
  return nil, err
  }
- txFeeWithChange, err = calculateDynamicFee(gasUsedWithChange, baseFee)
+ txFeeWithChange, err = CalculateDynamicFee(gasUsedWithChange, baseFee)
  if err != nil {
  return nil, err
  }

diff --git a/plugin/evm/import_tx_test.go b/plugin/evm/import_tx_test.go
@@ -449,7 +449,7 @@ func TestNewImportTx(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- actualFee, err = calculateDynamicFee(actualCost, initialBaseFee)
+ actualFee, err = CalculateDynamicFee(actualCost, initialBaseFee)
  if err != nil {
  t.Fatal(err)
  }
@@ -853,7 +853,7 @@ func TestImportTxGasCost(t *testing.T) {
  t.Fatalf("Expected gasUsed to be %d, but found %d", test.ExpectedGasUsed, gasUsed)
  }
 
- fee, err := calculateDynamicFee(gasUsed, test.BaseFee)
+ fee, err := CalculateDynamicFee(gasUsed, test.BaseFee)
  if err != nil {
  t.Fatal(err)
  }

diff --git a/plugin/evm/tx.go b/plugin/evm/tx.go
@@ -172,7 +172,7 @@ func (tx *Tx) BlockFeeContribution(fixedFee bool, avaxAssetID ids.ID, baseFee *b
  if err != nil {
  return nil, nil, err
  }
- txFee, err := calculateDynamicFee(gasUsed, baseFee)
+ txFee, err := CalculateDynamicFee(gasUsed, baseFee)
  if err != nil {
  return nil, nil, err
  }
@@ -262,7 +262,7 @@ func IsSortedAndUniqueEVMOutputs(outputs []EVMOutput) bool {
 
 // calculates the amount of AVAX that must be burned by an atomic transaction
 // that consumes [cost] at [baseFee].
-func calculateDynamicFee(cost uint64, baseFee *big.Int) (uint64, error) {
+func CalculateDynamicFee(cost uint64, baseFee *big.Int) (uint64, error) {
  if baseFee == nil {
  return 0, errNilBaseFee
  }

diff --git a/plugin/evm/tx_test.go b/plugin/evm/tx_test.go
@@ -36,7 +36,7 @@ func TestCalculateDynamicFee(t *testing.T) {
  }
 
  for _, test := range tests {
- cost, err := calculateDynamicFee(test.gas, test.baseFee)
+ cost, err := CalculateDynamicFee(test.gas, test.baseFee)
  if test.expectedErr == nil {
  if err != nil {
  t.Fatalf("Unexpectedly failed to calculate dynamic fee: %s", err)

diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -1542,7 +1542,7 @@ func (vm *VM) GetSpendableAVAXWithFee(
  return nil, nil, err
  }
 
- initialFee, err := calculateDynamicFee(cost, baseFee)
+ initialFee, err := CalculateDynamicFee(cost, baseFee)
  if err != nil {
  return nil, nil, err
  }
@@ -1562,13 +1562,13 @@ func (vm *VM) GetSpendableAVAXWithFee(
  break
  }
 
- prevFee, err := calculateDynamicFee(cost, baseFee)
+ prevFee, err := CalculateDynamicFee(cost, baseFee)
  if err != nil {
  return nil, nil, err
  }
 
  newCost := cost + EVMInputGas
- newFee, err := calculateDynamicFee(newCost, baseFee)
+ newFee, err := CalculateDynamicFee(newCost, baseFee)
  if err != nil {
  return nil, nil, err
  }