move const variable to class var, fix warrnings

Author: skywinder

Tests/web3swiftTests/web3swift_keystores_Tests.swift

@@ -11,6 +11,8 @@ import CryptoSwift
 
 class web3swift_Keystores_tests: XCTestCase {
 
+    let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
+    
     func testBIP39 () {
         var entropy = Data.fromHex("00000000000000000000000000000000")!
         var phrase = BIP39.generateMnemonicsFromEntropy(entropy: entropy)
@@ -88,7 +90,6 @@ class web3swift_Keystores_tests: XCTestCase {
     }
 
     func testBIP32keystoreMatching() {
-        let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
         let keystore = try! BIP32Keystore(mnemonics: mnemonic, password: "", mnemonicsPassword: "banana")
         XCTAssertNotNil(keystore)
         let account = keystore!.addresses![0]
@@ -98,15 +99,13 @@ class web3swift_Keystores_tests: XCTestCase {
     }
 
     func testBIP32keystoreMatchingRootNode() {
-        let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
         let keystore = try! BIP32Keystore(mnemonics: mnemonic, password: "", mnemonicsPassword: "banana")
         XCTAssertNotNil(keystore)
         let rootNode = try! keystore!.serializeRootNodeToString(password: "")
         XCTAssert(rootNode == "xprvA2KM71v838kPwE8Lfr12m9DL939TZmPStMnhoFcZkr1nBwDXSG7c3pjYbMM9SaqcofK154zNSCp7W7b4boEVstZu1J3pniLQJJq7uvodfCV")
     }
 
     func testBIP32keystoreCustomPathMatching() {
-        let mnemonic = "fruit wave dwarf banana earth journey tattoo true farm silk olive fence"
         let keystore = try! BIP32Keystore(mnemonics: mnemonic, password: "", mnemonicsPassword: "banana", prefixPath:"m/44'/60'/0'/0")
         XCTAssertNotNil(keystore)
         let account = keystore!.addresses![0]
@@ -156,8 +155,8 @@ class web3swift_Keystores_tests: XCTestCase {
         print(recreatedStore!.addresses![0].address)
         print(recreatedStore!.addresses![1].address)
         // This will fail. It wont fail if use scrypt from pod 'scrypt', '2.0', not from CryptoSwift
-        XCTAssert(keystore?.addresses![0] == recreatedStore?.addresses![1])
-        XCTAssert(keystore?.addresses![1] == recreatedStore?.addresses![0])
+        XCTAssert(keystore?.addresses![1] == recreatedStore?.addresses![1])
+        XCTAssert(keystore?.addresses![0] == recreatedStore?.addresses![0])
     }
 
     //    func testPBKDF2() {

web3swift.xcodeproj/project.pbxproj

@@ -1406,7 +1406,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=150";
+				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=350";
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1468,7 +1468,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=150";
+				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=350";
 				SDKROOT = macosx;
 				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";
 				SWIFT_COMPILATION_MODE = wholemodule;