Remove references to reify

libp2p · Jan 31, 2023 · 15f6fa5 · 15f6fa5
1 parent 2f95f28
commit 15f6fa5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/p2p/host/resource-manager/README.md b/p2p/host/resource-manager/README.md
@@ -28,7 +28,7 @@ scalingLimits := rcmgr.DefaultLimits
 // Add limits around included libp2p protocols
 libp2p.SetDefaultServiceLimits(&scalingLimits)
 
-// Turn the scaling limits into a reified set of limits using `.AutoScale`. This
+// Turn the scaling limits into a concrete set of limits using `.AutoScale`. This
 // scales the limits proportional to your system memory.
 scaledDefaultLimits := scalingLimits.AutoScale()
 

diff --git a/p2p/host/resource-manager/limit_config_test.go b/p2p/host/resource-manager/limit_config_test.go
@@ -111,16 +111,16 @@ func TestLimitConfigRoundTrip(t *testing.T) {
 	defaults := DefaultLimits
 	defaults.AddServiceLimit("C", DefaultLimits.ServiceBaseLimit, BaseLimitIncrease{})
 	defaults.AddProtocolPeerLimit("C", DefaultLimits.ServiceBaseLimit, BaseLimitIncrease{})
-	reifiedCfg, err := readLimiterConfigFromJSON(in, defaults.AutoScale())
+	concreteCfg, err := readLimiterConfigFromJSON(in, defaults.AutoScale())
 	require.NoError(t, err)
 
 	// Roundtrip
-	limitConfig := reifiedCfg.ToLimitConfig()
+	limitConfig := concreteCfg.ToLimitConfig()
 	// Using InfiniteLimits because it's different then the defaults used above.
 	// If anything was marked "default" in the round trip, it would show up as a
 	// difference here.
-	reifiedCfgRT := limitConfig.Build(InfiniteLimits)
-	require.Equal(t, reifiedCfg, reifiedCfgRT)
+	concreteCfgRT := limitConfig.Build(InfiniteLimits)
+	require.Equal(t, concreteCfg, concreteCfgRT)
 }
 
 func TestReadmeLimitConfigSerialization(t *testing.T) {

diff --git a/p2p/host/resource-manager/limit_defaults.go b/p2p/host/resource-manager/limit_defaults.go
@@ -148,6 +148,12 @@ func (l *LimitVal) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &val); err != nil {
 		return err
 	}
+
+	if val == 0 {
+		// If there is an explicit 0 in the JSON we should interpret this as block all.
+		*l = BlockAllLimit
+	}
+
 	*l = LimitVal(val)
 	return nil
 }
@@ -576,7 +582,7 @@ func resourceLimitsMapFromBaseLimitMap[K comparable](baseLimitMap map[K]BaseLimi
 	return out
 }
 
-// ToLimitConfig converts a ReifiedLimitConfig to a PartialLimitConfig. The returned
+// ToLimitConfig converts a ConcreteLimitConfig to a PartialLimitConfig. The returned
 // PartialLimitConfig will have no default values.
 func (cfg ConcreteLimitConfig) ToLimitConfig() PartialLimitConfig {
 	return PartialLimitConfig{

diff --git a/p2p/host/resource-manager/limit_test.go b/p2p/host/resource-manager/limit_test.go
@@ -203,11 +203,11 @@ func TestRoundTripFromConcreteAndBack(t *testing.T) {
 		},
 	}
 
-	reified := l.Build(InfiniteLimits)
+	concrete := l.Build(InfiniteLimits)
 
 	// Roundtrip
-	fromReified := reified.ToLimitConfigWithDefaults(InfiniteLimits)
-	require.Equal(t, l, fromReified)
+	fromConcrete := concrete.ToLimitConfigWithDefaults(InfiniteLimits)
+	require.Equal(t, l, fromConcrete)
 }
 
 func TestSerializeJSON(t *testing.T) {

diff --git a/p2p/test/resource-manager/rcmgr_test.go b/p2p/test/resource-manager/rcmgr_test.go
@@ -299,7 +299,7 @@ func TestReadmeExample(t *testing.T) {
 	// Add limits around included libp2p protocols
 	libp2p.SetDefaultServiceLimits(&scalingLimits)
 
-	// Turn the scaling limits into a reified set of limits using `.AutoScale`. This
+	// Turn the scaling limits into a concrete set of limits using `.AutoScale`. This
 	// scales the limits proportional to your system memory.
 	scaledDefaultLimits := scalingLimits.AutoScale()