Address merge issues

casper-network · Oct 17, 2024 · 4d58809 · 4d58809
1 parent ada9291
commit 4d58809
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/types/src/lib.rs b/types/src/lib.rs
@@ -132,7 +132,7 @@ pub use chainspec::{
     ProtocolConfig, ProtocolUpgradeConfig, RefundHandling, StandardPaymentCosts, StorageCosts,
     SystemConfig, TransactionConfig, TransactionLimitsDefinition, TransactionV1Config,
     VacancyConfig, ValidatorConfig, WasmConfig, DEFAULT_GAS_HOLD_INTERVAL,
-    DEFAULT_HOST_FUNCTION_NEW_DICTIONARY, DEFAULT_REFUND_HANDLING,
+    DEFAULT_HOST_FUNCTION_NEW_DICTIONARY, DEFAULT_MINIMUM_BID_AMOUNT, DEFAULT_REFUND_HANDLING,
 };
 #[cfg(any(all(feature = "std", feature = "testing"), test))]
 pub use chainspec::{

diff --git a/types/src/transaction/pricing_mode.rs b/types/src/transaction/pricing_mode.rs
@@ -158,7 +158,7 @@ impl PricingMode {
                                 });
                             }
                             TransactionEntryPoint::AddBid | TransactionEntryPoint::ActivateBid => {
-                                costs.auction_costs().add_bid.into()
+                                costs.auction_costs().add_bid
                             }
                             TransactionEntryPoint::WithdrawBid => {
                                 costs.auction_costs().withdraw_bid.into()