Skip to content

Commit

Permalink
Merge pull request #179 from matter-labs/develop
Browse files Browse the repository at this point in the history
2.2.0
  • Loading branch information
BaldyAsh authored Apr 30, 2019
2 parents 8c7bc1a + 358d2a2 commit 90b55a6
Show file tree
Hide file tree
Showing 2,196 changed files with 110,339 additions and 192,568 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
#Carthage/Build

# fastlane
#
Expand All @@ -66,5 +66,5 @@ fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
API_keys.plist
web3swiftTests/key.json
web3swiftTests/Resources/key.json

.DS_Store
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ xcode_project: web3swift.xcworkspace
xcode_scheme: web3swift-iOS
xcode_destination: platform=iOS Simulator, OS=12.2, name=iPhone X
before_install:
- gem install cocoapods --pre
- pod install --repo-update
- brew install carthage || true
- brew outdated carthage || brew upgrade carthage
before_script:
- carthage bootstrap --platform iOS --no-use-binaries --cache-builds
script:
- xcodebuild -scheme web3swift-iOS -workspace web3swift.xcworkspace -sdk iphonesimulator build test
- xcodebuild -scheme web3swift -project web3swift.xcodeproj -sdk iphonesimulator build test
after_success:
- bash <(curl -s https://codecov.io/bash)
4 changes: 4 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
github "mxcl/PromiseKit" ~> 6.8.4
github "attaswift/BigInt" ~> 3.1
github "daltoniam/Starscream" ~> 3.1.0
github "krzyzanowskim/CryptoSwift" ~> 1.0.0
5 changes: 5 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
github "attaswift/BigInt" "v3.1.0"
github "attaswift/SipHash" "v1.2.2"
github "daltoniam/Starscream" "3.1.0"
github "krzyzanowskim/CryptoSwift" "1.0.0"
github "mxcl/PromiseKit" "6.8.4"
14 changes: 14 additions & 0 deletions Carthage/Checkouts/BigInt/.codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ignore:
- "/tests/*"
comment:
layout: "header, diff"
behavior: default
require_changes: no
coverage:
status:
project:
default:
target: auto
threshold: null
base: auto
paths: "sources/*"
6 changes: 6 additions & 0 deletions Carthage/Checkouts/BigInt/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/Carthage/Build
/.build
/Packages
xcuserdata
/Package.pins
/Package.resolved
3 changes: 3 additions & 0 deletions Carthage/Checkouts/BigInt/.gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Carthage/Checkouts/SipHash"]
path = Carthage/Checkouts/SipHash
url = https://github.com/attaswift/SipHash.git
1 change: 1 addition & 0 deletions Carthage/Checkouts/BigInt/.swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
10 changes: 10 additions & 0 deletions Carthage/Checkouts/BigInt/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
language: objective-c
osx_image: xcode9.3
script:
- swift build
- swift test
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-macOS test
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-iOS
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-watchOS
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-tvOS
after_success: bash <(curl -s https://codecov.io/bash)
18 changes: 18 additions & 0 deletions Carthage/Checkouts/BigInt/BigInt.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

Pod::Spec.new do |spec|
spec.name = 'BigInt'
spec.version = '3.1.0'
spec.ios.deployment_target = "8.0"
spec.osx.deployment_target = "10.9"
spec.tvos.deployment_target = "9.0"
spec.watchos.deployment_target = "2.0"
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
spec.summary = 'Arbitrary-precision arithmetic in pure Swift'
spec.homepage = 'https://github.com/attaswift/BigInt'
spec.author = 'Károly Lőrentey'
spec.source = { :git => 'https://github.com/attaswift/BigInt.git', :tag => 'v' + String(spec.version) }
spec.source_files = 'sources/*.swift'
spec.social_media_url = 'https://twitter.com/lorentey'
spec.documentation_url = 'http://attaswift.github.io/BigInt/'
spec.dependency 'SipHash', '~> 1.2'
end
1,324 changes: 1,324 additions & 0 deletions Carthage/Checkouts/BigInt/BigInt.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>classNames</key>
<dict>
<key>ProfileTests</key>
<dict>
<key>testBalancedMultiplication()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.41604</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testDivision()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.70161</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testFibonacciAddition()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>2.3569</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testGCD()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>1.801</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testMersennePrimes()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>4.184</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testModularExponentiation()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>2.1938</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testMultiplicationByDigit()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.91891</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
<key>testSquareRoot()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.48118</real>
<key>baselineIntegrationDisplayName</key>
<string>2016-11-15 18:19:04</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>classNames</key>
<dict>
<key>ProfileTests</key>
<dict>
<key>testBalancedMultiplication()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.31603</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testDivision()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.60765</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testFibonacciAddition()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>2.0927</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testGCD()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>1.3631</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testMersennePrimes()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>3.4959</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testModularExponentiation()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>1.7139</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testMultiplicationByDigit()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.60397</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
<key>testSquareRoot()</key>
<dict>
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
<dict>
<key>baselineAverage</key>
<real>0.40256</real>
<key>baselineIntegrationDisplayName</key>
<string>Jun 21, 2017, 5:03:36 PM</string>
</dict>
</dict>
</dict>
</dict>
</dict>
</plist>
Loading

0 comments on commit 90b55a6

Please sign in to comment.