mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-08 14:43:09 -06:00
0f3c17d16e
* Blacklist some sytest tests that are failing in our environment * Commenting out test that isn't reliably passing or failing, probably a race * refresh latest dendrite main * refresh latest dendrite main * dendrite implementation of eip-4361 * simplify nonce generation Co-authored-by: Brian Meek <brian@hntlabs.com> Co-authored-by: Tak Wai Wong <takwaiw@gmail.com>
45 lines
1.2 KiB
Go
45 lines
1.2 KiB
Go
// Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package mapsutil
|
|
|
|
// Union two maps together with "b" overriding the values of "a"
|
|
// if the keys collide.
|
|
func MapsUnion(a map[string]interface{}, b map[string]interface{}) map[string]interface{} {
|
|
c := make(map[string]interface{})
|
|
for k, v := range a {
|
|
c[k] = v
|
|
}
|
|
for k, v := range b {
|
|
c[k] = v
|
|
}
|
|
|
|
return c
|
|
}
|
|
|
|
// Make a copy of the map
|
|
func MapCopy(m map[string]interface{}) map[string]interface{} {
|
|
cp := make(map[string]interface{})
|
|
for k, v := range m {
|
|
vm, ok := v.(map[string]interface{})
|
|
if ok {
|
|
cp[k] = MapCopy(vm)
|
|
} else {
|
|
cp[k] = v
|
|
}
|
|
}
|
|
|
|
return cp
|
|
}
|