find_breaking_changes: simplify checking of wrapped types

Replicates graphql/graphql-js@4bff6d8

Author: Cito

graphql/utilities/find_breaking_changes.py

@@ -428,20 +428,7 @@ def find_fields_that_changed_type_on_input_object_types(
 def is_change_safe_for_object_or_interface_field(
     old_type: GraphQLType, new_type: GraphQLType
 ) -> bool:
-    if is_named_type(old_type):
-        return (
-            # if they're both named types, see if their names are equivalent
-            is_named_type(new_type)
-            and cast(GraphQLNamedType, old_type).name
-            == cast(GraphQLNamedType, new_type).name
-        ) or (
-            # moving from nullable to non-null of same underlying type is safe
-            is_non_null_type(new_type)
-            and is_change_safe_for_object_or_interface_field(
-                old_type, cast(GraphQLNonNull, new_type).of_type
-            )
-        )
-    elif is_list_type(old_type):
+    if is_list_type(old_type):
         return (
             # if they're both lists, make sure underlying types are compatible
             is_list_type(new_type)
@@ -455,37 +442,43 @@ def is_change_safe_for_object_or_interface_field(
                 old_type, cast(GraphQLNonNull, new_type).of_type
             )
         )
-    elif is_non_null_type(old_type):
+
+    if is_non_null_type(old_type):
         # if they're both non-null, make sure underlying types are compatible
         return is_non_null_type(
             new_type
         ) and is_change_safe_for_object_or_interface_field(
             cast(GraphQLNonNull, old_type).of_type,
             cast(GraphQLNonNull, new_type).of_type,
         )
-    else:
-        return False
+
+    return (
+        # if they're both named types, see if their names are equivalent
+        is_named_type(new_type)
+        and cast(GraphQLNamedType, old_type).name
+        == cast(GraphQLNamedType, new_type).name
+    ) or (
+        # moving from nullable to non-null of same underlying type is safe
+        is_non_null_type(new_type)
+        and is_change_safe_for_object_or_interface_field(
+            old_type, cast(GraphQLNonNull, new_type).of_type
+        )
+    )
 
 
 def is_change_safe_for_input_object_field_or_field_arg(
     old_type: GraphQLType, new_type: GraphQLType
 ) -> bool:
-    if is_named_type(old_type):
-        return (
-            # if they're both named types, see if their names are equivalent
-            is_named_type(new_type)
-            and cast(GraphQLNamedType, old_type).name
-            == cast(GraphQLNamedType, new_type).name
-        )
-    elif is_list_type(old_type):
+    if is_list_type(old_type):
 
         return is_list_type(
             # if they're both lists, make sure underlying types are compatible
             new_type
         ) and is_change_safe_for_input_object_field_or_field_arg(
             cast(GraphQLList, old_type).of_type, cast(GraphQLList, new_type).of_type
         )
-    elif is_non_null_type(old_type):
+
+    if is_non_null_type(old_type):
         return (
             # if they're both non-null, make sure the underlying types are compatible
             is_non_null_type(new_type)
@@ -500,8 +493,13 @@ def is_change_safe_for_input_object_field_or_field_arg(
                 cast(GraphQLNonNull, old_type).of_type, new_type
             )
         )
-    else:
-        return False
+
+    return (
+        # if they're both named types, see if their names are equivalent
+        is_named_type(new_type)
+        and cast(GraphQLNamedType, old_type).name
+        == cast(GraphQLNamedType, new_type).name
+    )
 
 
 def find_types_removed_from_unions(