btcruby 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496c31ea05b95ca3fe1971a17eea51f43a2c00b6
-  data.tar.gz: 6a8cbbe43cd39b004f188f32c90e6c492d7f78d2
+  metadata.gz: a64dd3f298bb55c7d1bc660b6318771030fa6e6f
+  data.tar.gz: 6f9d6e72597bc798b2f025c3003d093f972a50ff
 SHA512:
-  metadata.gz: 5de016754bc4fdec389d62e4fbce3b3f104a00eb698fb1647c02c7531223cfb41066e3c13eb0a286cb91ba59950493af8edd9c061f427c0317cc424b699b3e43
-  data.tar.gz: 4514a56b1c78db5e1e3beaf3fc5983b964451bf4a007adeb359d2c16b05e0e4b291ecdf06917b689446f33ec22ef5bf9a36cfd6496d2bc37a955896a01606e23
+  metadata.gz: 38c83c30020fdc804fcd467bf20bd241709924c7b7708e8da72202c23717e9cb59b54c9916e6d5a09902b067107ebd8d4c14fa26b854495e4f1ac34693eb8ac7
+  data.tar.gz: 7cbd2dc8332ae5e4756d813b207f592d541ff1d878b512bb902853b9b8fb6d626f28505cd1aea90f54706871544fcde1c45c9d1ccd81927aa85f2ff39e18e9ec

data/RELEASE_NOTES.md

@@ -2,6 +2,13 @@
 BTCRuby Release Notes
 =====================
 
+1.1.5 (August 20, 2015)
+-----------------------
+
+* Fixed namespace issues with `BTC::Opcodes`.
+* All tests are running with explicit namespaces.
+
+
 1.1.4 (August 18, 2015)
 -----------------------
 

data/lib/btcruby.rb

@@ -15,6 +15,7 @@ require_relative 'btcruby/big_number.rb'
 require_relative 'btcruby/base58.rb'
 
 require_relative 'btcruby/constants.rb'
+require_relative 'btcruby/script/opcode.rb'
 require_relative 'btcruby/currency_formatter.rb'
 require_relative 'btcruby/network.rb'
 require_relative 'btcruby/address.rb'
@@ -35,7 +36,6 @@ require_relative 'btcruby/script/script_number.rb'
 require_relative 'btcruby/script/script_chunk.rb'
 require_relative 'btcruby/script/script.rb'
 require_relative 'btcruby/script/script_interpreter.rb'
-require_relative 'btcruby/script/opcode.rb'
 require_relative 'btcruby/script/signature_hashtype.rb'
 require_relative 'btcruby/script/signature_checker.rb'
 require_relative 'btcruby/script/test_signature_checker.rb'

data/lib/btcruby/address.rb

@@ -27,6 +27,7 @@
 #
 module BTC
   class Address
+    include Opcodes
     @@registered_classes = []
     
     # Decodes address from a Base58Check-encoded string

data/lib/btcruby/open_assets/asset_marker.rb

@@ -1,5 +1,6 @@
 module BTC
   class AssetMarker
+    include Opcodes
     
     MAGIC = "\x4f\x41".freeze
     VERSION1 = "\x01\x00".freeze

data/lib/btcruby/script/opcode.rb

@@ -201,5 +201,8 @@ module BTC
   
   # Make all opcodes available as BTC::OP_...
   include Opcodes
+  module Opcode
+    include Opcodes
+  end
 end
 

data/lib/btcruby/script/script.rb

@@ -1,6 +1,7 @@
 module BTC
   class Script
-
+    include Opcodes
+    
     # Serialized binary form of the script (payload)
     attr_reader :data
 

data/lib/btcruby/script/script_chunk.rb

@@ -1,6 +1,7 @@
 module BTC
   # ScriptChunk represents either an opcode or a pushdata command.
   class ScriptChunk
+    include Opcodes
     # Raw data for this chunk.
     # 1 byte for regular opcode, 1 or more bytes for pushdata command.
     # We do not call it 'data' to avoid confusion with `pushdata` (see below).

data/lib/btcruby/script/script_error.rb

@@ -1,47 +1,51 @@
 module BTC
-  SCRIPT_ERR_OK = 0
-  SCRIPT_ERR_UNKNOWN_ERROR = 1
-  SCRIPT_ERR_EVAL_FALSE = 2
-  SCRIPT_ERR_OP_RETURN = 3
+  module ScriptErrors
+    SCRIPT_ERR_OK = 0
+    SCRIPT_ERR_UNKNOWN_ERROR = 1
+    SCRIPT_ERR_EVAL_FALSE = 2
+    SCRIPT_ERR_OP_RETURN = 3
 
-  # Max sizes
-  SCRIPT_ERR_SCRIPT_SIZE = 4
-  SCRIPT_ERR_PUSH_SIZE = 5
-  SCRIPT_ERR_OP_COUNT = 6
-  SCRIPT_ERR_STACK_SIZE = 7
-  SCRIPT_ERR_SIG_COUNT = 8
-  SCRIPT_ERR_PUBKEY_COUNT = 9
+    # Max sizes
+    SCRIPT_ERR_SCRIPT_SIZE = 4
+    SCRIPT_ERR_PUSH_SIZE = 5
+    SCRIPT_ERR_OP_COUNT = 6
+    SCRIPT_ERR_STACK_SIZE = 7
+    SCRIPT_ERR_SIG_COUNT = 8
+    SCRIPT_ERR_PUBKEY_COUNT = 9
 
-  # Failed verify operations
-  SCRIPT_ERR_VERIFY = 10
-  SCRIPT_ERR_EQUALVERIFY = 11
-  SCRIPT_ERR_CHECKMULTISIGVERIFY = 12
-  SCRIPT_ERR_CHECKSIGVERIFY = 13
-  SCRIPT_ERR_NUMEQUALVERIFY = 14
+    # Failed verify operations
+    SCRIPT_ERR_VERIFY = 10
+    SCRIPT_ERR_EQUALVERIFY = 11
+    SCRIPT_ERR_CHECKMULTISIGVERIFY = 12
+    SCRIPT_ERR_CHECKSIGVERIFY = 13
+    SCRIPT_ERR_NUMEQUALVERIFY = 14
 
-  # Logical/Format/Canonical errors
-  SCRIPT_ERR_BAD_OPCODE = 15
-  SCRIPT_ERR_DISABLED_OPCODE = 16
-  SCRIPT_ERR_INVALID_STACK_OPERATION = 17
-  SCRIPT_ERR_INVALID_ALTSTACK_OPERATION = 18
-  SCRIPT_ERR_UNBALANCED_CONDITIONAL = 19
+    # Logical/Format/Canonical errors
+    SCRIPT_ERR_BAD_OPCODE = 15
+    SCRIPT_ERR_DISABLED_OPCODE = 16
+    SCRIPT_ERR_INVALID_STACK_OPERATION = 17
+    SCRIPT_ERR_INVALID_ALTSTACK_OPERATION = 18
+    SCRIPT_ERR_UNBALANCED_CONDITIONAL = 19
 
-  # OP_CHECKLOCKTIMEVERIFY
-  SCRIPT_ERR_NEGATIVE_LOCKTIME = 20
-  SCRIPT_ERR_UNSATISFIED_LOCKTIME = 21
+    # OP_CHECKLOCKTIMEVERIFY
+    SCRIPT_ERR_NEGATIVE_LOCKTIME = 20
+    SCRIPT_ERR_UNSATISFIED_LOCKTIME = 21
 
-  # BIP62
-  SCRIPT_ERR_SIG_HASHTYPE = 22
-  SCRIPT_ERR_SIG_DER = 23
-  SCRIPT_ERR_MINIMALDATA = 24
-  SCRIPT_ERR_SIG_PUSHONLY = 25
-  SCRIPT_ERR_SIG_HIGH_S = 26
-  SCRIPT_ERR_SIG_NULLDUMMY = 27
-  SCRIPT_ERR_PUBKEYTYPE = 28
-  SCRIPT_ERR_CLEANSTACK = 29
+    # BIP62
+    SCRIPT_ERR_SIG_HASHTYPE = 22
+    SCRIPT_ERR_SIG_DER = 23
+    SCRIPT_ERR_MINIMALDATA = 24
+    SCRIPT_ERR_SIG_PUSHONLY = 25
+    SCRIPT_ERR_SIG_HIGH_S = 26
+    SCRIPT_ERR_SIG_NULLDUMMY = 27
+    SCRIPT_ERR_PUBKEYTYPE = 28
+    SCRIPT_ERR_CLEANSTACK = 29
 
-  # softfork safeness
-  SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS = 30
+    # softfork safeness
+    SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS = 30
+  end
+  
+  include ScriptErrors
   
   class ScriptError
     attr_reader :code

data/lib/btcruby/script/script_interpreter.rb

@@ -12,6 +12,8 @@ module BTC
   # returning a bool indicating valid or not.  There are no loops.
   class ScriptInterpreter
     include ScriptFlags
+    include ScriptErrors
+    include Opcodes
 
     # Flags specified for this interpreter, not including flags added by plugins.
     attr_accessor :flags

data/lib/btcruby/script/script_interpreter_plugin.rb

@@ -9,6 +9,8 @@ module BTC
   # - hook for handling the opcodes
   module ScriptInterpreterPlugin
     include ScriptFlags
+    include ScriptErrors
+    include Opcodes
 
     # Returns additional flags to be available to #flag? checks during script execution.
     # This way one plugin can affect evaluation of another.

data/lib/btcruby/transaction_builder.rb

@@ -14,6 +14,7 @@ module BTC
 
   # TransactionBuilder composes and optionally sings a transaction.
   class TransactionBuilder
+    include Opcodes
 
     # Network to validate provided addresses against.
     # Default value is `Network.default`.

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.1.4".freeze
+  VERSION = "1.1.5".freeze
 end

data/spec/address_spec.rb

@@ -32,7 +32,7 @@ describe BTC::Address do
 
     address.data.must_equal "243f1394f44554f4ce3fd68649c19adc483ce924".from_hex
 
-    address2 = BTC::PublicKeyAddress.new(hash: "243f1394f44554f4ce3fd68649c19adc483ce924".from_hex, network: Network.testnet)
+    address2 = BTC::PublicKeyAddress.new(hash: "243f1394f44554f4ce3fd68649c19adc483ce924".from_hex, network: BTC::Network.testnet)
 
     address2.to_s.must_equal("mipcBbFg9gMiCh81Kj8tqqdgoZub1ZJRfn")
     address2.data.must_equal("243f1394f44554f4ce3fd68649c19adc483ce924".from_hex)
@@ -40,13 +40,13 @@ describe BTC::Address do
 
   it "should detect invalid pay-to-pubkey-hash address" do
     lambda { BTC::Address.parse(nil) }.must_raise ArgumentError
-    lambda { BTC::Address.parse("") }.must_raise FormatError
-    lambda { BTC::Address.parse("18FGfswVqxNubJbh1NW8A4t51T9x9RDVWQ") }.must_raise FormatError
-    lambda { BTC::Address.parse("19FGfswVqxNubJbh1NW8A4t51T9x9RDvwq") }.must_raise FormatError
-    lambda { BTC::Address.parse("19FGfswVqxNubJbh1NW8A4t51T9x9RD") }.must_raise FormatError
-    lambda { BTC::Address.parse("mipcBbFg9gMiCh81Kj8tqqdgoZub1ZJRf") }.must_raise FormatError
-    lambda { BTC::Address.parse("m") }.must_raise FormatError
-    lambda { BTC::Address.parse("mipc") }.must_raise FormatError
+    lambda { BTC::Address.parse("") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("18FGfswVqxNubJbh1NW8A4t51T9x9RDVWQ") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("19FGfswVqxNubJbh1NW8A4t51T9x9RDvwq") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("19FGfswVqxNubJbh1NW8A4t51T9x9RD") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("mipcBbFg9gMiCh81Kj8tqqdgoZub1ZJRf") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("m") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("mipc") }.must_raise BTC::FormatError
   end
 
   it "should decode/encode mainnet pay-to-script-hash address" do
@@ -89,12 +89,12 @@ describe BTC::Address do
   end
 
   it "should detect invalid pay-to-script-hash address" do
-    lambda { BTC::Address.parse("3ektnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX") }.must_raise FormatError
-    lambda { BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzqX") }.must_raise FormatError
-    lambda { BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSg") }.must_raise FormatError
-    lambda { BTC::Address.parse("2mzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1Vc") }.must_raise FormatError
-    lambda { BTC::Address.parse("2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1vc") }.must_raise FormatError
-    lambda { BTC::Address.parse("2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJ") }.must_raise FormatError
+    lambda { BTC::Address.parse("3ektnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzqX") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSg") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("2mzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1Vc") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1vc") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJ") }.must_raise BTC::FormatError
   end
 
 
@@ -139,12 +139,12 @@ describe BTC::Address do
   end
 
   it "should detect invalid private key address" do
-    lambda { BTC::Address.parse("5kJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS") }.must_raise FormatError
-    lambda { BTC::Address.parse("5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hs") }.must_raise FormatError
-    lambda { BTC::Address.parse("5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZ") }.must_raise FormatError
-    lambda { BTC::Address.parse("L3P8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJF9woSu") }.must_raise FormatError
-    lambda { BTC::Address.parse("L3p8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJF9woSU") }.must_raise FormatError
-    lambda { BTC::Address.parse("L3p8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJ") }.must_raise FormatError
+    lambda { BTC::Address.parse("5kJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hS") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZXj3hs") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("5KJvsngHeMpm884wtkJNzQGaCErckhHJBGFsvd3VyK5qMZ") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("L3P8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJF9woSu") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("L3p8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJF9woSU") }.must_raise BTC::FormatError
+    lambda { BTC::Address.parse("L3p8oAcQTtuokSCRHQ7i4MhjWc9zornvpJLfmg62sYpLRJ") }.must_raise BTC::FormatError
   end
 
   it "should convert strings and addresses into normalized address" do
@@ -191,8 +191,8 @@ describe BTC::Address do
   it "should detect if wrong subclass is used when parsing an address" do
     btc_addr_string = "19FGfswVqxNubJbh1NW8A4t51T9x9RDVWQ"
     asset_addr_string = "akB4NBW9UuCmHuepksob6yfZs6naHtRCPNy"
-    btc_addr = Address.parse(btc_addr_string)
-    asset_addr = Address.parse(asset_addr_string)
+    btc_addr = BTC::Address.parse(btc_addr_string)
+    asset_addr = BTC::Address.parse(asset_addr_string)
 
     ->{ BTC::AssetAddress.parse(btc_addr_string) }.must_raise ArgumentError
     ->{ BTC::AssetAddress.parse(btc_addr) }.must_raise ArgumentError

data/spec/base58_spec.rb

@@ -2,34 +2,34 @@ require_relative 'spec_helper'
 describe BTC::Base58 do
 
   def check_invalid_base58(base58_string, expected_class = BTC::FormatError)
-    lambda { Base58.data_from_base58(base58_string) }.must_raise expected_class
+    lambda { BTC::Base58.data_from_base58(base58_string) }.must_raise expected_class
   end
 
   def check_invalid_base58check(base58check_string, expected_class = BTC::FormatError)
-    lambda { Base58.data_from_base58check(base58check_string) }.must_raise expected_class
+    lambda { BTC::Base58.data_from_base58check(base58check_string) }.must_raise expected_class
   end
 
   def check_valid_base58(hex_string, base58_string)
     # Convert to Base58
-    Base58.base58_from_data(BTC.from_hex(hex_string)).must_equal(base58_string)
+    BTC::Base58.base58_from_data(BTC.from_hex(hex_string)).must_equal(base58_string)
 
     # Convert from Base58
-    BTC.to_hex(Base58.data_from_base58(base58_string)).must_equal(hex_string)
+    BTC.to_hex(BTC::Base58.data_from_base58(base58_string)).must_equal(hex_string)
   end
 
   def check_valid_base58check(hex, string)
     # Convert to Base58Check
-    Base58.base58check_from_data(BTC.from_hex(hex)).must_equal(string)
+    BTC::Base58.base58check_from_data(BTC.from_hex(hex)).must_equal(string)
 
     # Convert from Base58Check
-    BTC.to_hex(Base58.data_from_base58check(string)).must_equal(hex)
+    BTC.to_hex(BTC::Base58.data_from_base58check(string)).must_equal(hex)
   end
 
   describe "Base58" do
     it "should handle valid input" do
 
-      lambda { Base58.data_from_base58(nil) }.must_raise ArgumentError
-      lambda { Base58.base58_from_data(nil) }.must_raise ArgumentError
+      lambda { BTC::Base58.data_from_base58(nil) }.must_raise ArgumentError
+      lambda { BTC::Base58.base58_from_data(nil) }.must_raise ArgumentError
       check_valid_base58("", "")
       check_valid_base58("13", "L")
       check_valid_base58("2e", "o")

data/spec/block_header_spec.rb

@@ -3,15 +3,15 @@ describe BTC::BlockHeader do
 
   describe "Genesis Mainnet" do
     it "should have a correct hash" do
-      BlockHeader.genesis_mainnet.block_id.must_equal "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
-      BlockHeader.genesis_mainnet.height.must_equal 0
+      BTC::BlockHeader.genesis_mainnet.block_id.must_equal "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
+      BTC::BlockHeader.genesis_mainnet.height.must_equal 0
     end
   end
 
   describe "Genesis Testnet" do
     it "should have a correct hash" do
-      BlockHeader.genesis_testnet.block_id.must_equal "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
-      BlockHeader.genesis_testnet.height.must_equal 0
+      BTC::BlockHeader.genesis_testnet.block_id.must_equal "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
+      BTC::BlockHeader.genesis_testnet.height.must_equal 0
     end
   end
   

data/spec/block_spec.rb

@@ -3,15 +3,15 @@ describe BTC::Block do
 
   describe "Genesis Mainnet" do
     it "should have a correct hash" do
-      Block.genesis_mainnet.block_id.must_equal "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
-      Block.genesis_mainnet.height.must_equal 0
+      BTC::Block.genesis_mainnet.block_id.must_equal "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
+      BTC::Block.genesis_mainnet.height.must_equal 0
     end
   end
 
   describe "Genesis Testnet" do
     it "should have a correct hash" do
-      Block.genesis_testnet.block_id.must_equal "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
-      Block.genesis_testnet.height.must_equal 0
+      BTC::Block.genesis_testnet.block_id.must_equal "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
+      BTC::Block.genesis_testnet.height.must_equal 0
     end
   end
   

data/spec/currency_formatter_spec.rb

@@ -5,42 +5,42 @@ describe BTC::CurrencyFormatter do
   it "should support normal bitcoin formatting" do
     fm = BTC::CurrencyFormatter.btc_formatter
 
-    fm.string_from_number(1*COIN).must_equal("1.0")
-    fm.string_from_number(42*COIN).must_equal("42.0")
-    fm.string_from_number(42000*COIN).must_equal("42000.0")
-    fm.string_from_number(42000*COIN + 123).must_equal("42000.00000123")
-    fm.string_from_number(42000*COIN + 123000).must_equal("42000.00123")
-    fm.string_from_number(42000*COIN + 123456).must_equal("42000.00123456")
-    fm.string_from_number(42000*COIN + COIN/2).must_equal("42000.5")
+    fm.string_from_number(1*BTC::COIN).must_equal("1.0")
+    fm.string_from_number(42*BTC::COIN).must_equal("42.0")
+    fm.string_from_number(42000*BTC::COIN).must_equal("42000.0")
+    fm.string_from_number(42000*BTC::COIN + 123).must_equal("42000.00000123")
+    fm.string_from_number(42000*BTC::COIN + 123000).must_equal("42000.00123")
+    fm.string_from_number(42000*BTC::COIN + 123456).must_equal("42000.00123456")
+    fm.string_from_number(42000*BTC::COIN + BTC::COIN/2).must_equal("42000.5")
 
-    fm.number_from_string("1").must_equal 1*COIN
-    fm.number_from_string("1.").must_equal 1*COIN
-    fm.number_from_string("1.0").must_equal 1*COIN
-    fm.number_from_string("42").must_equal 42*COIN
-    fm.number_from_string("42.123").must_equal 42*COIN + 12300000
-    fm.number_from_string("42.12345678").must_equal 42*COIN + 12345678
-    fm.number_from_string("42.10000000").must_equal 42*COIN + 10000000
-    fm.number_from_string("42.10000").must_equal    42*COIN + 10000000
+    fm.number_from_string("1").must_equal 1*BTC::COIN
+    fm.number_from_string("1.").must_equal 1*BTC::COIN
+    fm.number_from_string("1.0").must_equal 1*BTC::COIN
+    fm.number_from_string("42").must_equal 42*BTC::COIN
+    fm.number_from_string("42.123").must_equal 42*BTC::COIN + 12300000
+    fm.number_from_string("42.12345678").must_equal 42*BTC::COIN + 12345678
+    fm.number_from_string("42.10000000").must_equal 42*BTC::COIN + 10000000
+    fm.number_from_string("42.10000").must_equal    42*BTC::COIN + 10000000
   end
 
   it "should support long bitcoin formatting" do
     fm = BTC::CurrencyFormatter.btc_long_formatter
 
-    fm.string_from_number(1*COIN).must_equal("1.00000000")
-    fm.string_from_number(42*COIN).must_equal("42.00000000")
-    fm.string_from_number(42000*COIN).must_equal("42000.00000000")
-    fm.string_from_number(42000*COIN + 123).must_equal("42000.00000123")
-    fm.string_from_number(42000*COIN + 123000).must_equal("42000.00123000")
-    fm.string_from_number(42000*COIN + 123456).must_equal("42000.00123456")
-    fm.string_from_number(42000*COIN + COIN/2).must_equal("42000.50000000")
+    fm.string_from_number(1*BTC::COIN).must_equal("1.00000000")
+    fm.string_from_number(42*BTC::COIN).must_equal("42.00000000")
+    fm.string_from_number(42000*BTC::COIN).must_equal("42000.00000000")
+    fm.string_from_number(42000*BTC::COIN + 123).must_equal("42000.00000123")
+    fm.string_from_number(42000*BTC::COIN + 123000).must_equal("42000.00123000")
+    fm.string_from_number(42000*BTC::COIN + 123456).must_equal("42000.00123456")
+    fm.string_from_number(42000*BTC::COIN + BTC::COIN/2).must_equal("42000.50000000")
 
-    fm.number_from_string("1").must_equal 1*COIN
-    fm.number_from_string("1.").must_equal 1*COIN
-    fm.number_from_string("1.0").must_equal 1*COIN
-    fm.number_from_string("42").must_equal 42*COIN
-    fm.number_from_string("42.123").must_equal 42*COIN + 12300000
-    fm.number_from_string("42.12345678").must_equal 42*COIN + 12345678
-    fm.number_from_string("42.10000000").must_equal 42*COIN + 10000000
-    fm.number_from_string("42.10000").must_equal    42*COIN + 10000000
+    fm.number_from_string("1").must_equal 1*BTC::COIN
+    fm.number_from_string("1.").must_equal 1*BTC::COIN
+    fm.number_from_string("1.0").must_equal 1*BTC::COIN
+    fm.number_from_string("42").must_equal 42*BTC::COIN
+    fm.number_from_string("42.123").must_equal 42*BTC::COIN + 12300000
+    fm.number_from_string("42.12345678").must_equal 42*BTC::COIN + 12345678
+    fm.number_from_string("42.10000000").must_equal 42*BTC::COIN + 10000000
+    fm.number_from_string("42.10000").must_equal    42*BTC::COIN + 10000000
   end
 end