LBRYCommunity/lbcutil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make amount constants untyped.

Browse source 
Since these constants can be useful for int64, Amount, and float64
math, it doesn't make sense to make them just one type, and require
type conversions for the rest.

ok @davecgh
This commit is contained in:
Josh Rickmar 2014-07-07 08:55:44 -05:00
parent 6c4b5928ab
commit e0adcd5f70
3 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
amount.go
View file

@ -80,7 +80,7 @@ func NewAmount(f float64) (Amount, error) {
return 0, errors.New("invalid bitcoin amount")
}
return round(f * satoshiPerBitcoin), nil
return round(f * SatoshiPerBitcoin), nil
}
// ToUnit converts a monetary amount counted in bitcoin base units to a

30
amount_test.go
View file

@ -29,49 +29,49 @@ func TestAmountCreation(t *testing.T) {
name: "max producable",
amount: 21e6,
valid: true,
expected: Amount(MaxSatoshi),
expected: MaxSatoshi,
},
{
name: "min producable",
amount: -21e6,
valid: true,
expected: Amount(-MaxSatoshi),
expected: -MaxSatoshi,
},
{
name: "exceeds max producable",
amount: 21e6 + 1e-8,
valid: true,
expected: Amount(MaxSatoshi + 1),
expected: MaxSatoshi + 1,
},
{
name: "exceeds min producable",
amount: -21e6 - 1e-8,
valid: true,
expected: Amount(-MaxSatoshi - 1),
expected: -MaxSatoshi - 1,
},
{
name: "one hundred",
amount: 100,
valid: true,
expected: Amount(100 * SatoshiPerBitcoin),
expected: 100 * SatoshiPerBitcoin,
},
{
name: "fraction",
amount: 0.01234567,
valid: true,
expected: Amount(1234567),
expected: 1234567,
},
{
name: "rounding up",
amount: 54.999999999999943157,
valid: true,
expected: Amount(55 * SatoshiPerBitcoin),
expected: 55 * SatoshiPerBitcoin,
},
{
name: "rounding down",
amount: 55.000000000000056843,
valid: true,
expected: Amount(55 * SatoshiPerBitcoin),
expected: 55 * SatoshiPerBitcoin,
},
// Negative tests.
@ -120,28 +120,28 @@ func TestAmountUnitConversions(t *testing.T) {
}{
{
name: "MBTC",
amount: Amount(MaxSatoshi),
amount: MaxSatoshi,
unit: AmountMegaBTC,
converted: 21,
s: "21 MBTC",
},
{
name: "kBTC",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountKiloBTC,
converted: 444.33322211100,
s: "444.333222111 kBTC",
},
{
name: "BTC",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountBTC,
converted: 444333.22211100,
s: "444333.222111 BTC",
},
{
name: "mBTC",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountMilliBTC,
converted: 444333222.11100,
s: "444333222.111 mBTC",
@ -149,7 +149,7 @@ func TestAmountUnitConversions(t *testing.T) {
{
name: "μBTC",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountMicroBTC,
converted: 444333222111.00,
s: "444333222111 μBTC",
@ -157,7 +157,7 @@ func TestAmountUnitConversions(t *testing.T) {
{
name: "satoshi",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountSatoshi,
converted: 44433322211100,
s: "44433322211100 Satoshi",
@ -165,7 +165,7 @@ func TestAmountUnitConversions(t *testing.T) {
{
name: "non-standard unit",
amount: Amount(44433322211100),
amount: 44433322211100,
unit: AmountUnit(-1),
converted: 4443332.2211100,
s: "4443332.22111 1e-1 BTC",

11
const.go
View file

@ -5,17 +5,12 @@
package btcutil
const (
// satoshiPerBitcoin is the untyped version of SatoshiPerBitcoin.
//
// TODO(jrick): Switch the exported consts below to be untyped.
satoshiPerBitcoin = 1e8
// SatoshiPerBitcent is the number of satoshi in one bitcoin cent.
SatoshiPerBitcent int64 = 1e6
SatoshiPerBitcent = 1e6
// SatoshiPerBitcoin is the number of satoshi in one bitcoin (1 BTC).
SatoshiPerBitcoin int64 = satoshiPerBitcoin
SatoshiPerBitcoin = 1e8
// MaxSatoshi is the maximum transaction amount allowed in satoshi.
MaxSatoshi int64 = 21e6 * SatoshiPerBitcoin
MaxSatoshi = 21e6 * SatoshiPerBitcoin
)