Skip to content
Snippets Groups Projects
Commit 6b2925b2 authored by Jonah Husson's avatar Jonah Husson
Browse files

Remove unnecessary load, add bad json test

parent f1f6ce87
No related branches found
No related tags found
3 merge requests!231Revert "Update store to print changes to the partners list",!187Xx 3829/triggers,!181Xx 3818/jsonbackup
...@@ -215,8 +215,7 @@ func (b *Backup) AddJson(newJson string) { ...@@ -215,8 +215,7 @@ func (b *Backup) AddJson(newJson string) {
b.mux.Lock() b.mux.Lock()
defer b.mux.Unlock() defer b.mux.Unlock()
currentJson := loadJson(b.store.GetKV()) if newJson != b.jsonParams {
if newJson != currentJson {
b.jsonParams = newJson b.jsonParams = newJson
if err := storeJson(newJson, b.store.GetKV()); err != nil { if err := storeJson(newJson, b.store.GetKV()); err != nil {
jww.FATAL.Panicf("Failed to store json: %+v", err) jww.FATAL.Panicf("Failed to store json: %+v", err)
......
...@@ -320,6 +320,44 @@ func TestBackup_AddJson(t *testing.T) { ...@@ -320,6 +320,44 @@ func TestBackup_AddJson(t *testing.T) {
} }
} }
func TestBackup_AddJson_badJson(t *testing.T) {
b := newTestBackup("MySuperSecurePassword", nil, t)
s := b.store
json := "abc{'i'm a bad json: 'one': 1'''}}"
expectedCollatedBackup := backup.Backup{
RegistrationTimestamp: s.GetUser().RegistrationTimestamp,
TransmissionIdentity: backup.TransmissionIdentity{
RSASigningPrivateKey: s.GetUser().TransmissionRSA,
RegistrarSignature: s.User().GetTransmissionRegistrationValidationSignature(),
Salt: s.GetUser().TransmissionSalt,
ComputedID: s.GetUser().TransmissionID,
},
ReceptionIdentity: backup.ReceptionIdentity{
RSASigningPrivateKey: s.GetUser().ReceptionRSA,
RegistrarSignature: s.User().GetReceptionRegistrationValidationSignature(),
Salt: s.GetUser().ReceptionSalt,
ComputedID: s.GetUser().ReceptionID,
DHPrivateKey: s.GetUser().E2eDhPrivateKey,
DHPublicKey: s.GetUser().E2eDhPublicKey,
},
UserDiscoveryRegistration: backup.UserDiscoveryRegistration{
FactList: s.GetUd().GetFacts(),
},
Contacts: backup.Contacts{Identities: s.E2e().GetPartners()},
JSONParams: json,
}
b.AddJson(json)
collatedBackup := b.assembleBackup()
if !reflect.DeepEqual(expectedCollatedBackup, collatedBackup) {
t.Errorf("Collated backup does not match expected."+
"\nexpected: %+v\nreceived: %+v",
expectedCollatedBackup, collatedBackup)
}
}
// Tests that Backup.assembleBackup returns the backup.Backup with the expected // Tests that Backup.assembleBackup returns the backup.Backup with the expected
// results. // results.
func TestBackup_assembleBackup(t *testing.T) { func TestBackup_assembleBackup(t *testing.T) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment