Skip to content

Commit 8d3938d

Browse files
chipshortchipshort
committed
Rename config fields
1 parent f5160b2 commit 8d3938d

File tree

5 files changed

+73
-73
lines changed

5 files changed

+73
-73
lines changed

‎internal/api/lib_test.go

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ func TestInitAndReleaseCache(t *testing.T) {
3535

3636
config := types.VMConfig{
3737
Cache: types.CacheOptions{
38-
BaseDir: tmpdir,
39-
AvailableCapabilities: TESTING_CAPABILITIES,
40-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
41-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
38+
BaseDir: tmpdir,
39+
AvailableCapabilities: TESTING_CAPABILITIES,
40+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
41+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
4242
},
4343
}
4444
cache, err := InitCache(config)
@@ -56,10 +56,10 @@ func TestInitCacheWorksForNonExistentDir(t *testing.T) {
5656
createMe := filepath.Join(tmpdir, "does-not-yet-exist")
5757
config := types.VMConfig{
5858
Cache: types.CacheOptions{
59-
BaseDir: createMe,
60-
AvailableCapabilities: TESTING_CAPABILITIES,
61-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
62-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
59+
BaseDir: createMe,
60+
AvailableCapabilities: TESTING_CAPABILITIES,
61+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
62+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
6363
},
6464
}
6565
cache, err := InitCache(config)
@@ -74,10 +74,10 @@ func TestInitCacheErrorsForBrokenDir(t *testing.T) {
7474
cannotBeCreated := "/foo:bar"
7575
config := types.VMConfig{
7676
Cache: types.CacheOptions{
77-
BaseDir: cannotBeCreated,
78-
AvailableCapabilities: TESTING_CAPABILITIES,
79-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
80-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
77+
BaseDir: cannotBeCreated,
78+
AvailableCapabilities: TESTING_CAPABILITIES,
79+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
80+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
8181
},
8282
}
8383
_, err := InitCache(config)
@@ -91,21 +91,21 @@ func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
9191

9292
config1 := types.VMConfig{
9393
Cache: types.CacheOptions{
94-
BaseDir: tmpdir,
95-
AvailableCapabilities: TESTING_CAPABILITIES,
96-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
97-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
94+
BaseDir: tmpdir,
95+
AvailableCapabilities: TESTING_CAPABILITIES,
96+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
97+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
9898
},
9999
}
100100
cache1, err1 := InitCache(config1)
101101
require.NoError(t, err1)
102102

103103
config2 := types.VMConfig{
104104
Cache: types.CacheOptions{
105-
BaseDir: tmpdir,
106-
AvailableCapabilities: TESTING_CAPABILITIES,
107-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
108-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
105+
BaseDir: tmpdir,
106+
AvailableCapabilities: TESTING_CAPABILITIES,
107+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
108+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
109109
},
110110
}
111111
_, err2 := InitCache(config2)
@@ -116,10 +116,10 @@ func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
116116
// Now we can try again
117117
config3 := types.VMConfig{
118118
Cache: types.CacheOptions{
119-
BaseDir: tmpdir,
120-
AvailableCapabilities: TESTING_CAPABILITIES,
121-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
122-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
119+
BaseDir: tmpdir,
120+
AvailableCapabilities: TESTING_CAPABILITIES,
121+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
122+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
123123
},
124124
}
125125
cache3, err3 := InitCache(config3)
@@ -140,30 +140,30 @@ func TestInitLockingAllowsMultipleInstancesInDifferentDirs(t *testing.T) {
140140

141141
config1 := types.VMConfig{
142142
Cache: types.CacheOptions{
143-
BaseDir: tmpdir1,
144-
AvailableCapabilities: TESTING_CAPABILITIES,
145-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
146-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
143+
BaseDir: tmpdir1,
144+
AvailableCapabilities: TESTING_CAPABILITIES,
145+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
146+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
147147
},
148148
}
149149
cache1, err1 := InitCache(config1)
150150
require.NoError(t, err1)
151151
config2 := types.VMConfig{
152152
Cache: types.CacheOptions{
153-
BaseDir: tmpdir2,
154-
AvailableCapabilities: TESTING_CAPABILITIES,
155-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
156-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
153+
BaseDir: tmpdir2,
154+
AvailableCapabilities: TESTING_CAPABILITIES,
155+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
156+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
157157
},
158158
}
159159
cache2, err2 := InitCache(config2)
160160
require.NoError(t, err2)
161161
config3 := types.VMConfig{
162162
Cache: types.CacheOptions{
163-
BaseDir: tmpdir3,
164-
AvailableCapabilities: TESTING_CAPABILITIES,
165-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
166-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
163+
BaseDir: tmpdir3,
164+
AvailableCapabilities: TESTING_CAPABILITIES,
165+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
166+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
167167
},
168168
}
169169
cache3, err3 := InitCache(config3)
@@ -180,10 +180,10 @@ func TestInitCacheEmptyCapabilities(t *testing.T) {
180180
defer os.RemoveAll(tmpdir)
181181
config := types.VMConfig{
182182
Cache: types.CacheOptions{
183-
BaseDir: tmpdir,
184-
AvailableCapabilities: []string{},
185-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
186-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
183+
BaseDir: tmpdir,
184+
AvailableCapabilities: []string{},
185+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
186+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
187187
},
188188
}
189189
cache, err := InitCache(config)
@@ -196,10 +196,10 @@ func withCache(t testing.TB) (Cache, func()) {
196196
require.NoError(t, err)
197197
config := types.VMConfig{
198198
Cache: types.CacheOptions{
199-
BaseDir: tmpdir,
200-
AvailableCapabilities: TESTING_CAPABILITIES,
201-
MemoryCacheSize: types.NewSizeMebi(TESTING_CACHE_SIZE),
202-
InstanceMemoryLimit: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
199+
BaseDir: tmpdir,
200+
AvailableCapabilities: TESTING_CAPABILITIES,
201+
MemoryCacheSizeBytes: types.NewSizeMebi(TESTING_CACHE_SIZE),
202+
InstanceMemoryLimitBytes: types.NewSizeMebi(TESTING_MEMORY_LIMIT),
203203
},
204204
}
205205
cache, err := InitCache(config)

‎lib_libwasmvm.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ type VM struct {
3232
func NewVM(dataDir string, supportedCapabilities []string, memoryLimit uint32, printDebug bool, cacheSize uint32) (*VM, error) {
3333
return NewVMWithConfig(types.VMConfig{
3434
Cache: types.CacheOptions{
35-
BaseDir: dataDir,
36-
AvailableCapabilities: supportedCapabilities,
37-
MemoryCacheSize: types.NewSizeMebi(cacheSize),
38-
InstanceMemoryLimit: types.NewSizeMebi(memoryLimit),
35+
BaseDir: dataDir,
36+
AvailableCapabilities: supportedCapabilities,
37+
MemoryCacheSizeBytes: types.NewSizeMebi(cacheSize),
38+
InstanceMemoryLimitBytes: types.NewSizeMebi(memoryLimit),
3939
},
4040
}, printDebug)
4141
}

‎libwasmvm/src/cache.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,12 +1047,12 @@ mod tests {
10471047
#[test]
10481048
fn test_config_json() {
10491049
// see companion test "TestConfigJSON" on the Go side
1050-
const JSON: &str = r#"{"wasm_limits":{"initial_memory_limit":15,"table_size_limit":20,"max_imports":100,"max_function_params":0},"cache":{"base_dir":"/tmp","available_capabilities":["a","b"],"memory_cache_size":100,"instance_memory_limit":100}}"#;
1050+
const JSON: &str = r#"{"wasm_limits":{"initial_memory_limit_pages":15,"table_size_limit_elements":20,"max_imports":100,"max_function_params":0},"cache":{"base_dir":"/tmp","available_capabilities":["a","b"],"memory_cache_size_bytes":100,"instance_memory_limit_bytes":100}}"#;
10511051

10521052
let config: Config = serde_json::from_str(JSON).unwrap();
10531053

1054-
assert_eq!(config.wasm_limits.initial_memory_limit(), 15);
1055-
assert_eq!(config.wasm_limits.table_size_limit(), 20);
1054+
assert_eq!(config.wasm_limits.initial_memory_limit_pages(), 15);
1055+
assert_eq!(config.wasm_limits.table_size_limit_elements(), 20);
10561056
assert_eq!(config.wasm_limits.max_imports(), 100);
10571057
assert_eq!(config.wasm_limits.max_function_params(), 0);
10581058

@@ -1064,7 +1064,7 @@ mod tests {
10641064
config.cache.available_capabilities,
10651065
HashSet::from_iter(["a".to_string(), "b".to_string()])
10661066
);
1067-
assert_eq!(config.cache.memory_cache_size, Size::new(100));
1068-
assert_eq!(config.cache.instance_memory_limit, Size::new(100));
1067+
assert_eq!(config.cache.memory_cache_size_bytes, Size::new(100));
1068+
assert_eq!(config.cache.instance_memory_limit_bytes, Size::new(100));
10691069
}
10701070
}

‎types/config.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ type VMConfig struct {
1616
// For full documentation see the Rust side:
1717
// https://docs.rs/cosmwasm-vm/2.2.0-rc.1/cosmwasm_vm/struct.WasmLimits.html
1818
type WasmLimits struct {
19-
InitialMemoryLimit *uint32 `json:"initial_memory_limit,omitempty"`
20-
TableSizeLimit *uint32 `json:"table_size_limit,omitempty"`
21-
MaxImports *uint32 `json:"max_imports,omitempty"`
22-
MaxFunctions *uint32 `json:"max_functions,omitempty"`
23-
MaxFunctionParams *uint32 `json:"max_function_params,omitempty"`
24-
MaxTotalFunctionParams *uint32 `json:"max_total_function_params,omitempty"`
25-
MaxFunctionResults *uint32 `json:"max_function_results,omitempty"`
19+
InitialMemoryLimitPages *uint32 `json:"initial_memory_limit_pages,omitempty"`
20+
TableSizeLimitElements *uint32 `json:"table_size_limit_elements,omitempty"`
21+
MaxImports *uint32 `json:"max_imports,omitempty"`
22+
MaxFunctions *uint32 `json:"max_functions,omitempty"`
23+
MaxFunctionParams *uint32 `json:"max_function_params,omitempty"`
24+
MaxTotalFunctionParams *uint32 `json:"max_total_function_params,omitempty"`
25+
MaxFunctionResults *uint32 `json:"max_function_results,omitempty"`
2626
}
2727

2828
type CacheOptions struct {
29-
BaseDir string `json:"base_dir"`
30-
AvailableCapabilities []string `json:"available_capabilities"`
31-
MemoryCacheSize Size `json:"memory_cache_size"`
32-
InstanceMemoryLimit Size `json:"instance_memory_limit"`
29+
BaseDir string `json:"base_dir"`
30+
AvailableCapabilities []string `json:"available_capabilities"`
31+
MemoryCacheSizeBytes Size `json:"memory_cache_size_bytes"`
32+
InstanceMemoryLimitBytes Size `json:"instance_memory_limit_bytes"`
3333
}
3434

3535
type Size struct{ uint32 }

‎types/config_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ func TestConfigJSON(t *testing.T) {
1616
// see companion test "test_config_json" on the Rust side
1717
config := VMConfig{
1818
WasmLimits: WasmLimits{
19-
InitialMemoryLimit: Ptr(uint32(15)),
20-
TableSizeLimit: Ptr(uint32(20)),
21-
MaxImports: Ptr(uint32(100)),
22-
MaxFunctionParams: Ptr(uint32(0)),
19+
InitialMemoryLimitPages: Ptr(uint32(15)),
20+
TableSizeLimitElements: Ptr(uint32(20)),
21+
MaxImports: Ptr(uint32(100)),
22+
MaxFunctionParams: Ptr(uint32(0)),
2323
},
2424
Cache: CacheOptions{
25-
BaseDir: "/tmp",
26-
AvailableCapabilities: []string{"a", "b"},
27-
MemoryCacheSize: NewSize(100),
28-
InstanceMemoryLimit: NewSize(100),
25+
BaseDir: "/tmp",
26+
AvailableCapabilities: []string{"a", "b"},
27+
MemoryCacheSizeBytes: NewSize(100),
28+
InstanceMemoryLimitBytes: NewSize(100),
2929
},
3030
}
31-
expected := `{"wasm_limits":{"initial_memory_limit":15,"table_size_limit":20,"max_imports":100,"max_function_params":0},"cache":{"base_dir":"/tmp","available_capabilities":["a","b"],"memory_cache_size":100,"instance_memory_limit":100}}`
31+
expected := `{"wasm_limits":{"initial_memory_limit_pages":15,"table_size_limit_elements":20,"max_imports":100,"max_function_params":0},"cache":{"base_dir":"/tmp","available_capabilities":["a","b"],"memory_cache_size_bytes":100,"instance_memory_limit_bytes":100}}`
3232

3333
bz, err := json.Marshal(config)
3434
require.NoError(t, err)

0 commit comments

Comments
 (0)