money-tree 0.8.8 → 0.8.9

data/spec/lib/money-tree/openssl_extensions_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe MoneyTree::OpenSSLExtensions do
+  include MoneyTree::OpenSSLExtensions
+
+  context "with inputs" do
+    let(:key1) { OpenSSL::PKey::EC.new("secp256k1").generate_key }
+    let(:key2) { OpenSSL::PKey::EC.new("secp256k1").generate_key }
+    let(:point_1) { key1.public_key }
+    let(:point_2) { key2.public_key }
+    let(:point_infinity) { key1.public_key.set_to_infinity! }
+
+    it "requires valid points" do
+      expect { MoneyTree::OpenSSLExtensions.add(0, 0) }.to raise_error(ArgumentError)
+      expect { MoneyTree::OpenSSLExtensions.add(nil, nil) }.to raise_error(ArgumentError)
+      expect { MoneyTree::OpenSSLExtensions.add(point_1, 0) }.to raise_error(ArgumentError)
+      expect { MoneyTree::OpenSSLExtensions.add(0, point_2) }.to raise_error(ArgumentError)
+      expect { MoneyTree::OpenSSLExtensions.add(point_infinity, point_2) }.to raise_error(ArgumentError)
+      expect { MoneyTree::OpenSSLExtensions.add(point_1, point_2) }.to_not raise_error
+    end
+  end
+  
+end

data/spec/lib/money-tree/private_key_spec.rb

@@ -8,91 +8,91 @@ describe MoneyTree::PrivateKey do
   describe "to_hex" do
     it "has 64 characters" do
       # must always be 64 characters - leading zeroes need to be preserved!
-      @key.to_hex.length.should == 64
+      expect(@key.to_hex.length).to eql(64)
     end
 
     it "preserves leading zeros" do
       master = MoneyTree::Master.new seed_hex: "9cf6b6e8451c7d551cb402e2997566e5c7c258543eadb184f9f39322b2e6959b"
-      master.node_for_path("m/427").private_key.to_hex.length.should == 64
+      expect(master.node_for_path("m/427").private_key.to_hex.length).to eql(64)
     end
     
     it "is a valid hex" do
-      @key.to_hex.should == '5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b'      
+      expect(@key.to_hex).to eql('5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b'      )
     end
   end
   
   describe "to_wif" do
     it "is a 52 character base58 key" do
-      @key.to_wif.length.should == 52
+      expect(@key.to_wif.length).to eql(52)
     end
     
     it "starts with K or L" do
-      %w(K L).should include(@key.to_wif[0])
+      expect(%w(K L)).to include(@key.to_wif[0])
     end
     
     it "is a valid compressed wif" do
-      @key.to_wif.should == 'KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK'      
+      expect(@key.to_wif).to eql('KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK'      )
     end
   end
   
   describe "to_wif(compressed: false)" do
     it "is a 51 character base58 key" do
-      @key.to_wif(compressed: false).length.should == 51
+      expect(@key.to_wif(compressed: false).length).to eql(51)
     end
     
     it "starts with 5" do
-      @key.to_wif(compressed: false)[0].should == '5'
+      expect(@key.to_wif(compressed: false)[0]).to eql('5')
     end
     
     it "is valid" do
-      @key.to_wif(compressed: false).should == '5JXz5ZyFk31oHVTQxqce7yitCmTAPxBqeGQ4b7H3Aj3L45wUhoa'      
+      expect(@key.to_wif(compressed: false)).to eql('5JXz5ZyFk31oHVTQxqce7yitCmTAPxBqeGQ4b7H3Aj3L45wUhoa'      )
     end
   end
   
   describe "from_wif(wif)" do
     it "returns the key from a wif" do
-      @key.from_wif("5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ").should == '0c28fca386c7a227600b2fe50b7cae11ec86d3bf1fbe471be89827e19d72aa1d'
+      expect(@key.from_wif("5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ")).to eql('0c28fca386c7a227600b2fe50b7cae11ec86d3bf1fbe471be89827e19d72aa1d')
     end
     
     it "raises an error on bad checksum" do
-      lambda { @key.from_wif("5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTBADTJ") }.should raise_error(MoneyTree::Key::InvalidWIFFormat)
+      expect { @key.from_wif("5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTBADTJ") }.to raise_error(MoneyTree::Key::InvalidWIFFormat)
     end
   end
   
   describe "to_base64" do
     it "has 44 characters" do
-      @key.to_base64.length.should == 44
+      expect(@key.to_base64.length).to eql(44)
     end
   
     it "is a valid base64" do
-      @key.to_base64.should == 'Xq5Tdftfeg6mUFZjY776KDDvRBvcsZGYrfMY+u6G1ks='      
+      expect(@key.to_base64).to eql('Xq5Tdftfeg6mUFZjY776KDDvRBvcsZGYrfMY+u6G1ks='      )
     end
   end
   
   describe "from_base64(base64_key)" do
     it "parses base64 key" do
       @key = MoneyTree::PrivateKey.new(key: "Xq5Tdftfeg6mUFZjY776KDDvRBvcsZGYrfMY+u6G1ks=")
-      @key.to_hex.should == "5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b"
+      expect(@key.to_hex).to eql("5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b")
     end
     
     it "returns the key from base64 encoding" do
-      @key.from_base64("Xq5Tdftfeg6mUFZjY776KDDvRBvcsZGYrfMY+u6G1ks=").should == '5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b'
+      expect(@key.from_base64("Xq5Tdftfeg6mUFZjY776KDDvRBvcsZGYrfMY+u6G1ks=")).to eql('5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b')
     end
     
     it "raises an error on bad encoding" do
-      lambda { @key.from_base64("Xq5Tdftfeg6mUFZjY776KD&%#BbadBADrfMY+u6G1ks=") }.should raise_error(MoneyTree::Key::InvalidBase64Format)
+      expect { @key.from_base64("Xq5Tdftfeg6mUFZjY776KD&%#BbadBADrfMY+u6G1ks=") }.to raise_error(MoneyTree::Key::InvalidBase64Format)
     end
   end
   
   describe "valid?(eckey)" do
     it "checks for a valid key" do
-      @key.valid?.should be_truthy
+      expect(@key.valid?).to be_truthy
     end
   end
   
   describe "parse_raw_key" do
     it "returns error if key is not Bignum, hex, base64, or wif formatted" do
-      lambda { @key = MoneyTree::PrivateKey.new(key: "Thisisnotakey") }.should raise_error(MoneyTree::Key::KeyFormatNotFound)
+      expect { @key = MoneyTree::PrivateKey.new(key: "Thisisnotakey") }.to raise_error(MoneyTree::Key::KeyFormatNotFound)
       
     end
   end
@@ -104,7 +104,7 @@ describe MoneyTree::PrivateKey do
 
     describe "to_wif" do
       it "returns same wif" do
-        @key.to_wif.should == 'cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD'
+        expect(@key.to_wif).to eql('cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD')
       end
     end
   end

data/spec/lib/money-tree/public_key_spec.rb

@@ -10,47 +10,47 @@ describe MoneyTree::PublicKey do
   
     describe "to_hex(compressed: false)" do
       it "has 65 bytes" do
-        @key.uncompressed.to_hex.length.should == 130
+        expect(@key.uncompressed.to_hex.length).to eql(130)
       end
     
       it "is a valid hex" do
-        @key.uncompressed.to_hex.should == '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      
+        expect(@key.uncompressed.to_hex).to eql('042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      )
       end
     end
   
     describe "to_hex" do
       it "has 33 bytes" do
-        @key.to_hex.length.should == 66
+        expect(@key.to_hex.length).to eql(66)
       end
   
       it "is a valid compressed hex" do
-        @key.to_hex.should == '022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      
+        expect(@key.to_hex).to eql('022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      )
       end
     end
   
     describe "to_fingerprint" do
       it "returns a valid fingerprint" do
-        @key.to_fingerprint.should == "1fddf42e"
+        expect(@key.to_fingerprint).to eql("1fddf42e")
       end
     end
   
     describe "to_address(compressed: false)" do
       it "has 34 characters" do
-        @key.uncompressed.to_address.length.should == 34
+        expect(@key.uncompressed.to_address.length).to eql(34)
       end
     
       it "is a valid bitcoin address" do
-        @key.uncompressed.to_address.should == '133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      
+        expect(@key.uncompressed.to_address).to eql('133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      )
       end
     end
   
     describe "to_compressed_address" do
       it "has 34 characters" do
-        @key.to_address.length.should == 34
+        expect(@key.to_address.length).to eql(34)
       end
     
       it "is a valid compressed bitcoin address" do
-        @key.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
+        expect(@key.to_address).to eql('13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      )
       end
     end
   end
@@ -62,63 +62,63 @@ describe MoneyTree::PublicKey do
     
     describe "to_hex(compressed: false)" do
       it "has 65 bytes" do
-        @key.uncompressed.to_hex.length.should == 130
+        expect(@key.uncompressed.to_hex.length).to eql(130)
       end
     
       it "is a valid hex" do
-        @key.uncompressed.to_hex.should == '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      
+        expect(@key.uncompressed.to_hex).to eql('042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      )
       end
     end
   
     describe "to_hex" do
       it "has 33 bytes" do
-        @key.compressed.to_hex.length.should == 66
+        expect(@key.compressed.to_hex.length).to eql(66)
       end
   
       it "is a valid compressed hex" do
-        @key.compressed.to_hex.should == '022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      
+        expect(@key.compressed.to_hex).to eql('022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      )
       end
     end
   
     describe "to_fingerprint" do
       it "returns a valid fingerprint" do
-        @key.compressed.to_fingerprint.should == "1fddf42e"
+        expect(@key.compressed.to_fingerprint).to eql("1fddf42e")
       end
     end
   
     describe "to_address(compressed: false)" do
       it "has 34 characters" do
-        @key.uncompressed.to_address.length.should == 34
+        expect(@key.uncompressed.to_address.length).to eql(34)
       end
     
       it "is a valid bitcoin address" do
-        @key.uncompressed.to_address.should == '133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      
+        expect(@key.uncompressed.to_address).to eql('133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      )
       end
     end
   
     describe "to_compressed_address" do
       it "has 34 characters" do
-        @key.compressed.to_address.length.should == 34
+        expect(@key.compressed.to_address.length).to eql(34)
       end
     
       it "is a valid compressed bitcoin address" do
-        @key.compressed.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
+        expect(@key.compressed.to_address).to eql('13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      )
       end
     end
     
     describe "#compression" do
       it "returns current compression setting" do
         @key.compression = :uncompressed
-        @key.compression.should == :uncompressed
+        expect(@key.compression).to eql(:uncompressed)
         @key.compression = :compressed
-        @key.compression.should == :compressed
+        expect(@key.compression).to eql(:compressed)
       end
     end
   end
   
   describe "with a bad key" do
     it "raises KeyFormatNotFound" do
-      lambda { @key = MoneyTree::PublicKey.new 'THISISNOTAVALIDKEY' }.should raise_error(MoneyTree::Key::KeyFormatNotFound)
+      expect { @key = MoneyTree::PublicKey.new 'THISISNOTAVALIDKEY' }.to raise_error(MoneyTree::Key::KeyFormatNotFound)
     end
   end
 
@@ -128,7 +128,7 @@ describe MoneyTree::PublicKey do
       100.times do 
         results << MoneyTree::PublicKey.new('042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4').to_s
       end
-      results.uniq.length.should == 1
+      expect(results.uniq.length).to eql(1)
     end
   end
 
@@ -141,7 +141,7 @@ describe MoneyTree::PublicKey do
       before_str = @key.to_s
       @key.uncompressed
       after_str = @key.to_s
-      before_str.should == after_str
+      expect(before_str).to eql(after_str)
     end
   end
 
@@ -154,7 +154,7 @@ describe MoneyTree::PublicKey do
       before_str = @key.to_s
       @key.compressed
       after_str = @key.to_s
-      before_str.should == after_str
+      expect(before_str).to eql(after_str)
     end
   end
 
@@ -166,7 +166,11 @@ describe MoneyTree::PublicKey do
       end
 
       it "should have an address starting with m or n" do
-        %w(m n).should include(@key.to_s[0])
+        expect(%w(m n)).to include(@key.to_s[0])
+      end
+
+      it "should have an uncompressed address starting with m or n" do
+        expect(%w(m n)).to include(@key.uncompressed.to_s[0])
       end
     end
 
@@ -176,7 +180,7 @@ describe MoneyTree::PublicKey do
       end
 
       it "should have an address starting with m or n" do
-        %w(m n).should include(@key.to_s[0])
+        expect(%w(m n)).to include(@key.to_s[0])
       end
     end
   end

data/spec/lib/money-tree/support_spec.rb

@@ -5,28 +5,28 @@ describe MoneyTree::Support do
 
   describe "sha256(str)" do
     it "properly calculates sha256 hash" do
-      sha256("abc", ascii: true).should == "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad"
-      sha256("800c28fca386c7a227600b2fe50b7cae11ec86d3bf1fbe471be89827e19d72aa1d").should == "8147786c4d15106333bf278d71dadaf1079ef2d2440a4dde37d747ded5403592"
-      sha256("8147786c4d15106333bf278d71dadaf1079ef2d2440a4dde37d747ded5403592").should == "507a5b8dfed0fc6fe8801743720cedec06aa5c6fca72b07c49964492fb98a714"
+      expect(sha256("abc", ascii: true)).to eql("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+      expect(sha256("800c28fca386c7a227600b2fe50b7cae11ec86d3bf1fbe471be89827e19d72aa1d")).to eql("8147786c4d15106333bf278d71dadaf1079ef2d2440a4dde37d747ded5403592")
+      expect(sha256("8147786c4d15106333bf278d71dadaf1079ef2d2440a4dde37d747ded5403592")).to eql("507a5b8dfed0fc6fe8801743720cedec06aa5c6fca72b07c49964492fb98a714")
     end
   end
   
   describe "ripemd160(str)" do
     it "properly calculates ripemd160 hash" do
-      ripemd160("abc", ascii: true).should == "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc"
-      ripemd160("e8026715af68676e0287ec9aa774f8103e4bddd5505b209263a8ff97c6ea29cc").should == "166db6510884918f31a9d246404760db8154bf84"
+      expect(ripemd160("abc", ascii: true)).to eql("8eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
+      expect(ripemd160("e8026715af68676e0287ec9aa774f8103e4bddd5505b209263a8ff97c6ea29cc")).to eql("166db6510884918f31a9d246404760db8154bf84")
     end
   end
   
   describe "hmac_sha512_hex(key, message)" do
     it "properly calculates hmac sha512" do
-      hmac_sha512_hex("Jefe", "what do ya want for nothing?").should == "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737"
+      expect(hmac_sha512_hex("Jefe", "what do ya want for nothing?")).to eql("164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737")
     end
   end
   
   describe "hex_to_int" do
     it "converts hex to integer" do
-      hex_to_int("abcdef0123456789").should == 12379813738877118345
+      expect(hex_to_int("abcdef0123456789")).to eql(12379813738877118345)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-tree
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Micah Winkelspecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -135,6 +135,7 @@ files:
 - money-tree.gemspec
 - spec/lib/money-tree/address_spec.rb
 - spec/lib/money-tree/node_spec.rb
+- spec/lib/money-tree/openssl_extensions_spec.rb
 - spec/lib/money-tree/private_key_spec.rb
 - spec/lib/money-tree/public_key_spec.rb
 - spec/lib/money-tree/support_spec.rb
@@ -166,6 +167,7 @@ summary: Bitcoin Hierarchical Deterministic Wallets in Ruby! (Bitcoin standard B
 test_files:
 - spec/lib/money-tree/address_spec.rb
 - spec/lib/money-tree/node_spec.rb
+- spec/lib/money-tree/openssl_extensions_spec.rb
 - spec/lib/money-tree/private_key_spec.rb
 - spec/lib/money-tree/public_key_spec.rb
 - spec/lib/money-tree/support_spec.rb