Skip to content

Commit

Permalink
Merge branch 'main' into fix/get-new-address
Browse files Browse the repository at this point in the history
  • Loading branch information
Ja7ad authored Jun 18, 2024
2 parents 5eaa5f6 + 1c01de1 commit f115c3d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions config/example_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@
# Default is `1000`.
max_size = 1000

# `min_fee` indicates the minimum fee in PAC for the transaction to enter into the pool.
# Default is `0.01`.
min_fee = 0.01

# `logger` contains configuration options for the logger.
[logger]
# `colorful` indicates whether log can be colorful or not.
Expand Down
4 changes: 2 additions & 2 deletions txpool/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (

type Config struct {
MaxSize int `toml:"max_size"`
MinFeePAC float64 `toml:"-"`
MinFeePAC float64 `toml:"min_fee"`
}

func DefaultConfig() *Config {
return &Config{
MaxSize: 1000,
MinFeePAC: 0.1,
MinFeePAC: 0.01,
}
}

Expand Down
2 changes: 1 addition & 1 deletion txpool/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestDefaultConfigCheck(t *testing.T) {
assert.Equal(t, 100, c.unbondPoolSize())
assert.Equal(t, 100, c.withdrawPoolSize())
assert.Equal(t, 100, c.sortitionPoolSize())
assert.Equal(t, amount.Amount(0.1e9), c.minFee())
assert.Equal(t, amount.Amount(0.1e8), c.minFee())

assert.Equal(t,
c.transferPoolSize()+
Expand Down

0 comments on commit f115c3d

Please sign in to comment.