aboutsummaryrefslogtreecommitdiff
path: root/src/core.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2014-07-03 14:25:32 -0400
committerGavin Andresen <gavinandresen@gmail.com>2014-07-03 14:42:16 -0400
commit13fc83c77bb9108c00dd7709ce17719edb763273 (patch)
tree4d9397d208b3c74bea11056ec9402fdfc81a36f5 /src/core.h
parent4b7b1bb1ac54e067d889170757a8c45f0baaae3d (diff)
Move fee policy out of core
Diffstat (limited to 'src/core.h')
-rw-r--r--src/core.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core.h b/src/core.h
index d6e7ab870d..0387336c98 100644
--- a/src/core.h
+++ b/src/core.h
@@ -125,8 +125,8 @@ public:
CFeeRate(int64_t nFeePaid, size_t nSize);
CFeeRate(const CFeeRate& other) { nSatoshisPerK = other.nSatoshisPerK; }
- int64_t GetFee(size_t size); // unit returned is satoshis
- int64_t GetFeePerK() { return GetFee(1000); } // satoshis-per-1000-bytes
+ int64_t GetFee(size_t size) const; // unit returned is satoshis
+ int64_t GetFeePerK() const { return GetFee(1000); } // satoshis-per-1000-bytes
friend bool operator<(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK < b.nSatoshisPerK; }
friend bool operator>(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK > b.nSatoshisPerK; }
@@ -217,8 +217,6 @@ private:
void UpdateHash() const;
public:
- static CFeeRate minTxFee;
- static CFeeRate minRelayTxFee;
static const int CURRENT_VERSION=1;
// The local variables are made const to prevent unintended modification