Merge pull request #5 from FactomProject/circle-ci

Re-merge circle-ci into master

Author: WhoSoup

.circleci/config.yml

@@ -0,0 +1,64 @@
+version: 2 
+jobs:
+  build:
+    docker: 
+      - image: circleci/golang:1.15
+
+    environment: 
+      TEST_RESULTS: /tmp/test-results
+
+    steps:
+      - checkout
+      - run: mkdir -p $TEST_RESULTS 
+
+      - restore_cache:
+          keys:
+            - go-mod-v4-{{ checksum "go.sum" }}
+
+      - run: go build
+
+      - run:
+          name: Run unit tests
+          command: |
+            PACKAGE_NAMES=$(go list ./... | circleci tests split --split-by=timings --timings-type=classname)
+            gotestsum --junitfile ${TEST_RESULTS}/gotestsum-report.xml -- $PACKAGE_NAMES
+            
+      - save_cache:
+          key: go-mod-v4-{{ checksum "go.sum" }}
+          paths:
+            - "/go/pkg/mod"
+
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: raw-test-output
+
+      - store_test_results:
+          path: /tmp/test-results
+
+  gofmt:
+    docker: 
+      - image: circleci/golang:1.15
+
+    steps:
+      - checkout
+      - run:
+          name: "Enforce Go Formatted Code"
+          command: test $(gofmt -l . | wc -l) -eq 0
+      
+  govet:
+    docker: 
+      - image: circleci/golang:1.15
+
+    steps:
+      - checkout
+      - run:
+          name: "Go vet"
+          command: go vet ./...
+
+workflows:
+  version: 2
+  build-workflow:
+    jobs:
+      - build
+      - gofmt
+      - govet

walletDBO.go

@@ -250,15 +250,13 @@ func (e *DBSeed) NextIdentityKey() (*factom.IdentityKey, error) {
 func NewRandomSeed() (*DBSeed, error) {
 	seed := make([]byte, 16)
 	if n, err := rand.Read(seed); err != nil {
-		panic(err)
 		return nil, err
 	} else if n != 16 {
 		return nil, fmt.Errorf("Wrong number of bytes read: %d", n)
 	}
 
 	mnemonic, err := bip39.NewMnemonic(seed)
 	if err != nil {
-		panic(err)
 		return nil, err
 	}
 
@@ -274,7 +272,7 @@ func (db *WalletDatabaseOverlay) InsertDBSeed(seed *DBSeed) error {
 	}
 
 	batch := []interfaces.Record{}
-	batch = append(batch, interfaces.Record{seedDBKey, seedDBKey, seed})
+	batch = append(batch, interfaces.Record{Bucket: seedDBKey, Key: seedDBKey, Data: seed})
 
 	return db.DBO.PutInBatch(batch)
 }
@@ -355,7 +353,7 @@ func (db *WalletDatabaseOverlay) InsertECAddress(e *factom.ECAddress) error {
 	}
 
 	batch := []interfaces.Record{}
-	batch = append(batch, interfaces.Record{ecDBPrefix, []byte(e.PubString()), e})
+	batch = append(batch, interfaces.Record{Bucket: ecDBPrefix, Key: []byte(e.PubString()), Data: e})
 
 	return db.DBO.PutInBatch(batch)
 }
@@ -407,7 +405,7 @@ func (db *WalletDatabaseOverlay) InsertFCTAddress(e *factom.FactoidAddress) erro
 	}
 
 	batch := []interfaces.Record{}
-	batch = append(batch, interfaces.Record{fcDBPrefix, []byte(e.String()), e})
+	batch = append(batch, interfaces.Record{Bucket: fcDBPrefix, Key: []byte(e.String()), Data: e})
 
 	return db.DBO.PutInBatch(batch)
 }
@@ -477,8 +475,6 @@ func (db *WalletDatabaseOverlay) RemoveAddress(pubString string) error {
 	} else {
 		return fmt.Errorf("Unknown address type")
 	}
-
-	return nil
 }
 
 type byFName []*factom.FactoidAddress
@@ -544,7 +540,7 @@ func (db *WalletDatabaseOverlay) InsertIdentityKey(e *factom.IdentityKey) error
 	}
 
 	batch := []interfaces.Record{}
-	batch = append(batch, interfaces.Record{identityDBPrefix, []byte(e.String()), e})
+	batch = append(batch, interfaces.Record{Bucket: identityDBPrefix, Key: []byte(e.String()), Data: e})
 
 	return db.DBO.PutInBatch(batch)
 }
@@ -596,8 +592,6 @@ func (db *WalletDatabaseOverlay) RemoveIdentityKey(pubString string) error {
 	} else {
 		return err
 	}
-
-	return nil
 }
 
 type byKeyName []*factom.IdentityKey

wsapi/structs.go

@@ -88,7 +88,7 @@ type identityKeyRequest struct {
 type importIdentityKeysRequest struct {
 	Keys []struct {
 		Secret string `json:"secret"`
-	} `json:keys`
+	} `json:"keys"`
 }
 
 type activeIdentityKeysRequest struct {

wsapi/wsapi.go

@@ -1571,7 +1571,6 @@ func factoidTxToTransaction(t interfaces.ITransaction) (
 
 	if r.TotalInputs <= r.TotalOutputs+r.TotalECOutputs {
 		r.FeesPaid = 0
-		r.FeesRequired = r.FeesRequired
 	} else {
 		r.FeesPaid = r.TotalInputs - (r.TotalOutputs + r.TotalECOutputs)
 	}