minor fixes

Author: tib

Makefile

@@ -1,19 +1,3 @@
-
-
-# ----------------------------------------
-# 	Swift
-# ----------------------------------------
-
-start:
-	swift run AVAllianceHummingbirdServer
-
-
-# docker build -t av-alliance-test-image -f Docker/BlogTests.Dockerfile .
-# docker run --name av-alliance-test-instance --rm av-alliance-test-image
-
-run:
-	swift run App
-
 build:
 	swift build
 
@@ -29,62 +13,5 @@ test-with-coverage:
 clean:
 	rm -rf .build
 
-# ----------------------------------------
-# 	System
-# ----------------------------------------
-
-install: release
-	install ./.build/release/App /usr/local/bin/App
-
-uninstall:
-	rm /usr/local/bin/App
-
-# ----------------------------------------
-# 	Docker
-# ----------------------------------------
-
-docker-build:
-	docker build \
-		-t av-alliance-image \
-		-f ./docker/AVAlliance.Dockerfile \
-		.
-
-docker-run: docker-build
-	docker run \
-		--name av-alliance \
-		-v $(PWD)/:/app \
-		-w /app \
-		-e "PS1=\u@\w: " \
-		-p 8080:8080 \
-		--rm \
-		-it av-alliance-image
-
-docker-clean:
-	docker rmi av-alliance-image
-
-# swift-format commands
-
 format:
 	swift-format -i -r ./Sources && swift-format -i -r ./Tests
-
-lint:
-	swift-format lint -r ./Sources && swift-format lint -r ./Tests
-
-openapi-server:
-	#docker run -p 8888:8080 -e SWAGGER_JSON=/mnt/openapi.yaml -v ./OpenAPI:/mnt swaggerapi/swagger-ui
-	docker run --rm --name "openapi-server" \
--v "$(PWD)/OpenAPI:/usr/share/nginx/html" \
--p 8888:80 nginx
-
-openapi-validate:
-	docker run --rm --name "openapi-validate" \
--v "$(PWD)/OpenAPI/openapi.yaml:/openapi.yaml" \
-pythonopenapi/openapi-spec-validator /openapi.yaml
-
-openapi-security-check:
-	docker run --rm --name "openapi-security-check" \
--v "$(PWD)/OpenAPI:/app" \
--t owasp/zap2docker-weekly zap-api-scan.py \
--t /app/openapi.yaml -f openapi
-
-

Package.swift

@@ -20,7 +20,6 @@ let package = Package(
         .target(name: "Bcrypt", dependencies: [
             .target(name: "CBcrypt"),
         ]),
-        // MARK: - tests
         .testTarget(
             name: "BcryptTests",
             dependencies: [

README.md

@@ -26,3 +26,9 @@ import Bcrypt
 let digest = try Bcrypt.hash("binary-birds", cost: 6)
 let res = try Bcrypt.verify("binary-birds", created: digest)
 ```
+
+## Credits
+
+This code is derived from the Vapor web framework:
+
+- [Vapor](https://github.com/vapor/vapor)

Sources/Bcrypt/BCrypt.swift

@@ -1,5 +1,4 @@
 import CBcrypt
-import Foundation
 
 extension FixedWidthInteger {
     public static func random() -> Self {
@@ -289,7 +288,7 @@ public final class BCryptDigest {
     }
 }
 
-public enum BcryptError: Swift.Error, CustomStringConvertible, LocalizedError {
+public enum BcryptError: Swift.Error, CustomStringConvertible {
     case invalidCost
     case invalidSalt
     case hashFailure

Tests/BcryptTests/BcryptTests.swift

@@ -2,6 +2,7 @@ import Bcrypt
 import XCTest
 
 final class BcryptTests: XCTestCase {
+
     func testVerify() throws {
         for (desired, message) in tests {
             let result = try Bcrypt.verify(message, created: desired)